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

8284112: Minor cleanup could be done in javax.crypto

Browse source 
Reviewed-by: wetmore
This commit is contained in:
Mark Powers 2022-04-18 23:48:22 +00:00 • committed by Bradford Wetmore
parent 897d6c0dc7
commit 41fc078323
37 changed files with 204 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/java.base/share/classes/javax/crypto/Mac.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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
@ -156,7 +156,7 @@ public class Mac implements Cloneable {
* {@code jdk.security.provider.preferred}
* {@link Security#getProperty(String) Security} property to determine
* the preferred provider order for the specified algorithm. This
* may be different than the order of providers returned by
* may be different from the order of providers returned by
* {@link Security#getProviders() Security.getProviders()}.
*
* @param algorithm the standard name of the requested MAC algorithm.
@ -182,7 +182,7 @@ public class Mac implements Cloneable {
Iterator<Service> t = services.iterator();
while (t.hasNext()) {
Service s = t.next();
if (JceSecurity.canUseProvider(s.getProvider()) == false) {
if (!JceSecurity.canUseProvider(s.getProvider())) {
continue;
}
return new Mac(s, t, algorithm);
@ -310,12 +310,12 @@ public class Mac implements Cloneable {
} else {
s = serviceIterator.next();
}
if (JceSecurity.canUseProvider(s.getProvider()) == false) {
if (!JceSecurity.canUseProvider(s.getProvider())) {
continue;
}
try {
Object obj = s.newInstance(null);
if (obj instanceof MacSpi == false) {
if (!(obj instanceof MacSpi)) {
continue;
}
spi = (MacSpi)obj;
@ -354,10 +354,10 @@ public class Mac implements Cloneable {
s = serviceIterator.next();
}
// if provider says it does not support this key, ignore it
if (s.supportsParameter(key) == false) {
if (!s.supportsParameter(key)) {
continue;
}
if (JceSecurity.canUseProvider(s.getProvider()) == false) {
if (!JceSecurity.canUseProvider(s.getProvider())) {
continue;
}
try {
@ -481,7 +481,7 @@ public class Mac implements Cloneable {
*/
public final void update(byte input) throws IllegalStateException {
chooseFirstProvider();
if (initialized == false) {
if (!initialized) {
throw new IllegalStateException("MAC not initialized");
}
spi.engineUpdate(input);
@ -497,7 +497,7 @@ public class Mac implements Cloneable {
*/
public final void update(byte[] input) throws IllegalStateException {
chooseFirstProvider();
if (initialized == false) {
if (!initialized) {
throw new IllegalStateException("MAC not initialized");
}
if (input != null) {
@ -519,7 +519,7 @@ public class Mac implements Cloneable {
public final void update(byte[] input, int offset, int len)
throws IllegalStateException {
chooseFirstProvider();
if (initialized == false) {
if (!initialized) {
throw new IllegalStateException("MAC not initialized");
}
@ -544,7 +544,7 @@ public class Mac implements Cloneable {
*/
public final void update(ByteBuffer input) {
chooseFirstProvider();
if (initialized == false) {
if (!initialized) {
throw new IllegalStateException("MAC not initialized");
}
if (input == null) {
@ -574,7 +574,7 @@ public class Mac implements Cloneable {
*/
public final byte[] doFinal() throws IllegalStateException {
chooseFirstProvider();
if (initialized == false) {
if (!initialized) {
throw new IllegalStateException("MAC not initialized");
}
byte[] mac = spi.engineDoFinal();
@ -612,7 +612,7 @@ public class Mac implements Cloneable {
throws ShortBufferException, IllegalStateException
{
chooseFirstProvider();
if (initialized == false) {
if (!initialized) {
throw new IllegalStateException("MAC not initialized");
}
int macLen = getMacLength();
@ -622,7 +622,6 @@ public class Mac implements Cloneable {
}
byte[] mac = doFinal();
System.arraycopy(mac, 0, output, outOffset, macLen);
return;
}
/**
@ -648,7 +647,7 @@ public class Mac implements Cloneable {
public final byte[] doFinal(byte[] input) throws IllegalStateException
{
chooseFirstProvider();
if (initialized == false) {
if (!initialized) {
throw new IllegalStateException("MAC not initialized");
}
update(input);