Merge pull request ibmruntimes#27 from keithc-ca/nonce

Access nonce only when non-null
dnakamura · Feb 18, 2021 · c8b23b0 · c8b23b0
2 parents 197706b + 85cec1c
commit c8b23b0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/closed/src/java.base/share/classes/com/sun/crypto/provider/NativeChaCha20Cipher.java b/closed/src/java.base/share/classes/com/sun/crypto/provider/NativeChaCha20Cipher.java
@@ -193,7 +193,7 @@ protected int engineGetOutputSize(int inputLen) {
      */
     @Override
     protected byte[] engineGetIV() {
-        return (nonce == null)? null : nonce.clone();
+        return (nonce != null) ? nonce.clone() : null;
     }
 
     /**
@@ -211,7 +211,7 @@ protected byte[] engineGetIV() {
     @Override
     protected AlgorithmParameters engineGetParameters() {
         AlgorithmParameters params = null;
-        byte[] nonceData = (initialized || nonce != null) ? nonce : createRandomNonce(null);
+        byte[] nonceData = (nonce != null) ? nonce : createRandomNonce(null);
         if (mode == MODE_AEAD) {
             try {
                 // Force the 12-byte nonce into a DER-encoded OCTET_STRING