stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8034272: Do not cram data into CRAM arrays

Browse Source 
Reviewed-by: mullan, ahgross
This commit is contained in:
Vinnie Ryan 2014-02-28 10:39:03 +00:00
parent 9eec94e88c
commit 839507dd64
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -32,6 +32,7 @@ import javax.security.sasl.Sasl;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.util.Arrays;
import java.util.logging.Logger; import java.util.logging.Logger;
/** /**
@ -159,7 +160,7 @@ abstract class CramMD5Base {
MessageDigest md5 = MessageDigest.getInstance("MD5"); MessageDigest md5 = MessageDigest.getInstance("MD5");
/* digest the key if longer than 64 bytes */ /* digest the key if longer than 64 bytes */
if (key.length > 64) { if (key.length > MD5_BLOCKSIZE) {
key = md5.digest(key); key = md5.digest(key);
} }
@ -169,13 +170,9 @@ abstract class CramMD5Base {
int i; int i;
/* store key in pads */ /* store key in pads */
for (i = 0; i < MD5_BLOCKSIZE; i++) { for (i = 0; i < key.length; i++) {
for ( ; i < key.length; i++) { ipad[i] = key[i];
ipad[i] = key[i]; opad[i] = key[i];
opad[i] = key[i];
}
ipad[i] = 0x00;
opad[i] = 0x00;
} }
/* XOR key with pads */ /* XOR key with pads */
@ -207,6 +204,11 @@ abstract class CramMD5Base {
} }
} }
Arrays.fill(ipad, (byte)0);
Arrays.fill(opad, (byte)0);
ipad = null;
opad = null;
return (digestString.toString()); return (digestString.toString());
} }