archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8282534: Remove redundant null check in ChaCha20Cipher.engineInit

Browse source 
Reviewed-by: xuelei
This commit is contained in:
Andrey Turbanov 2022-03-19 13:31:50 +00:00
parent e8caf84fb9
commit 80415e04c5
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -159,7 +159,7 @@ abstract class ChaCha20Cipher extends CipherSpi {
* ciphers, but allow {@code NoPadding}. See JCE spec.
*
* @param padding The padding type. The only allowed value is
* {@code NoPadding} case insensitive).
* {@code NoPadding} case insensitive.
*
* @throws NoSuchPaddingException if a padding scheme besides
* {@code NoPadding} is provided.
@ -393,7 +393,7 @@ abstract class ChaCha20Cipher extends CipherSpi {
return;
}
byte[] newNonce = null;
byte[] newNonce;
switch (mode) {
case MODE_NONE:
throw new InvalidAlgorithmParameterException(
@ -420,12 +420,6 @@ abstract class ChaCha20Cipher extends CipherSpi {
throw new RuntimeException("Invalid mode: " + mode);
}
// If after all the above processing we still don't have a nonce value
// then supply a random one provided a random source has been given.
if (newNonce == null) {
newNonce = createRandomNonce(random);
}
// Continue with initialization
init(opmode, key, newNonce);
}