Attachment 691121 Details for Bug 905128 – Revised patch that checks blockBuffer rather than blockBufferLen

[patch] Revised patch that checks blockBuffer rather than blockBufferLen

rh905128-non_block_ciphers.patch (text/plain), 2.22 KB, created by Andrew John Hughes on 2013-01-31 17:28:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew John Hughes

Created: 2013-01-31 17:28:44 UTC

Size: 2.22 KB

patch

obsolete

>diff --git a/src/share/classes/sun/security/pkcs11/P11Cipher.java b/src/share/classes/sun/security/pkcs11/P11Cipher.java
>--- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java
>+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java
>@@ -770,17 +770,19 @@
>             ensureInitialized();
>             int k = 0;
> 	    if (encrypt) {
>-		// Do we need to pad?
>-		if (paddingObj != null) {
>-		    int actualPadLen = paddingObj.setPaddingBytes(blockBuffer,
>-			blockBufferLen, blockSize - blockBufferLen);
>-		    blockBufferLen = blockSize;
>+		if (blockBuffer != null) {
>+		    // Do we need to pad?
>+		    if (paddingObj != null) {
>+			int actualPadLen = paddingObj.setPaddingBytes(blockBuffer,
>+			    blockBufferLen, blockSize - blockBufferLen);
>+			blockBufferLen = blockSize;
>+		    }
>+		    updating = true;
>+		    k = token.p11.C_EncryptUpdate(session.id(),
>+						  0, blockBuffer, 0, blockBufferLen,
>+						  0, out, outOfs, outLen);
>+		    updating = false;
> 		}
>-		updating = true;
>-		k = token.p11.C_EncryptUpdate(session.id(),
>-					      0, blockBuffer, 0, blockBufferLen,
>-					      0, out, outOfs, outLen);
>-		updating = false;
>                 k += token.p11.C_EncryptFinal(session.id(),
>                         0, out, (outOfs + k), (outLen - k));
>             } else {
>@@ -859,17 +861,19 @@
>             int k = 0;
> 
> 	    if (encrypt) {
>-		// Do we need to pad?
>-		if (paddingObj != null) {
>-		    int actualPadLen = paddingObj.setPaddingBytes(blockBuffer,
>-			blockBufferLen, blockSize - blockBufferLen);
>-		    blockBufferLen = blockSize;
>-		}
>-		updating = true;
>-		k = token.p11.C_EncryptUpdate(session.id(),
>+		if (blockBuffer != null) {
>+		    // Do we need to pad?
>+		    if (paddingObj != null) {
>+			int actualPadLen = paddingObj.setPaddingBytes(blockBuffer,
>+			    blockBufferLen, blockSize - blockBufferLen);
>+			blockBufferLen = blockSize;
>+		    }
>+		    updating = true;
>+		    k = token.p11.C_EncryptUpdate(session.id(),
> 						  0, blockBuffer, 0, blockBufferLen,
> 						  outAddr, outArray, outOfs, outLen);
>-		updating = false;
>+		    updating = false;
>+		}
>                 k += token.p11.C_EncryptFinal(session.id(),
>                         outAddr, outArray, (outOfs + k), (outLen - k));
> 	    } else {

Actions: View | Diff

Attachments on bug 905128: 689075 | 689076 | 689077 | 689096 | 689985 | 691121