undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
|
|
@ -0,0 +1,178 @@
|
|||
/*
|
||||
* Copyright (c) 2012, 2024, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import java.io.PrintStream;
|
||||
import java.security.AlgorithmParameters;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.security.Key;
|
||||
import java.security.Provider;
|
||||
import java.security.Security;
|
||||
import java.security.spec.AlgorithmParameterSpec;
|
||||
import java.util.Arrays;
|
||||
import java.util.Random;
|
||||
import java.util.StringTokenizer;
|
||||
import javax.crypto.Cipher;
|
||||
import javax.crypto.SecretKey;
|
||||
import javax.crypto.SecretKeyFactory;
|
||||
import javax.crypto.spec.PBEKeySpec;
|
||||
import javax.crypto.spec.PBEParameterSpec;
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8041781 8288050
|
||||
* @summary Test to see if key wrapper works correctly with PBEKey
|
||||
* @author Yu-Ching (Valerie) PENG
|
||||
* @author Bill Situ
|
||||
* @author Yun Ke
|
||||
* @run main TestCipherKeyWrapperPBEKey
|
||||
* @key randomness
|
||||
*/
|
||||
public class TestCipherKeyWrapperPBEKey {
|
||||
|
||||
private static final String[] PBEAlgorithms = {
|
||||
"pbeWithMD5ANDdes",
|
||||
"PBEWithMD5AndDES/CBC/PKCS5Padding",
|
||||
"PBEWithMD5AndTripleDES",
|
||||
"PBEWithMD5AndTripleDES/CBC/PKCS5Padding",
|
||||
"PBEwithSHA1AndDESede",
|
||||
"PBEwithSHA1AndDESede/CBC/PKCS5Padding",
|
||||
"PBEwithSHA1AndRC2_40",
|
||||
"PBEwithSHA1Andrc2_40/CBC/PKCS5Padding",
|
||||
"PBEWithSHA1AndRC2_128",
|
||||
"PBEWithSHA1andRC2_128/CBC/PKCS5Padding",
|
||||
"PBEWithSHA1AndRC4_40",
|
||||
"PBEWithsha1AndRC4_40/ECB/NoPadding",
|
||||
"PBEWithSHA1AndRC4_128",
|
||||
"pbeWithSHA1AndRC4_128/ECB/NoPadding",
|
||||
"PBEWithHmacSHA1AndAES_128",
|
||||
"PBEWithHmacSHA224AndAES_128",
|
||||
"PBEWithHmacSHA256AndAES_128",
|
||||
"PBEWithHmacSHA384AndAES_128",
|
||||
"PBEWithHmacSHA512AndAES_128",
|
||||
"PBEWithHmacSHA512/224AndAES_128",
|
||||
"PBEWithHmacSHA512/256AndAES_128",
|
||||
"PBEWithHmacSHA1AndAES_256",
|
||||
"PBEWithHmacSHA224AndAES_256",
|
||||
"PBEWithHmacSHA256AndAES_256",
|
||||
"PBEWithHmacSHA384AndAES_256",
|
||||
"PBEWithHmacSHA512AndAES_256",
|
||||
"PBEWithHmacSHA512/224AndAES_256",
|
||||
"PBEWithHmacSHA512/256AndAES_256",
|
||||
};
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
TestCipherKeyWrapperPBEKey test = new TestCipherKeyWrapperPBEKey();
|
||||
Provider sunjce = Security.getProvider(
|
||||
System.getProperty("test.provider.name", "SunJCE"));
|
||||
|
||||
if (!test.runAll(sunjce, System.out)) {
|
||||
throw new RuntimeException("One or more tests have failed....");
|
||||
}
|
||||
}
|
||||
|
||||
public boolean runAll(Provider p, PrintStream out) {
|
||||
boolean finalResult = true;
|
||||
|
||||
for (String algorithm : PBEAlgorithms) {
|
||||
out.println("Running test with " + algorithm + ":");
|
||||
try {
|
||||
if (!runTest(p, algorithm, out)) {
|
||||
finalResult = false;
|
||||
out.println("STATUS: Failed");
|
||||
} else {
|
||||
out.println("STATUS: Passed");
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
finalResult = false;
|
||||
ex.printStackTrace(out);
|
||||
out.println("STATUS:Failed");
|
||||
}
|
||||
}
|
||||
|
||||
return finalResult;
|
||||
}
|
||||
|
||||
// Have a generic throws Exception as it can throw many different exceptions
|
||||
public boolean runTest(Provider p, String algo, PrintStream out)
|
||||
throws Exception {
|
||||
|
||||
byte[] salt = new byte[8];
|
||||
int ITERATION_COUNT = 1000;
|
||||
AlgorithmParameters pbeParams = null;
|
||||
|
||||
String keyAlgo = (algo.endsWith("Padding") ?
|
||||
new StringTokenizer(algo, "/").nextToken().toUpperCase() :
|
||||
algo);
|
||||
boolean isAES = algo.contains("AES");
|
||||
|
||||
boolean isUnlimited =
|
||||
(Cipher.getMaxAllowedKeyLength(algo) == Integer.MAX_VALUE);
|
||||
|
||||
try {
|
||||
// Initialization
|
||||
new Random().nextBytes(salt);
|
||||
AlgorithmParameterSpec aps = new PBEParameterSpec(salt,
|
||||
ITERATION_COUNT);
|
||||
SecretKeyFactory skf = SecretKeyFactory.getInstance(keyAlgo, p);
|
||||
SecretKey key = skf.generateSecret(new PBEKeySpec(
|
||||
"Secret Key".toCharArray()));
|
||||
Cipher ci = Cipher.getInstance(algo);
|
||||
if (isAES) {
|
||||
ci.init(Cipher.WRAP_MODE, key);
|
||||
pbeParams = ci.getParameters();
|
||||
} else {
|
||||
ci.init(Cipher.WRAP_MODE, key, aps);
|
||||
}
|
||||
|
||||
byte[] keyWrapper = ci.wrap(key);
|
||||
if (isAES) {
|
||||
ci.init(Cipher.UNWRAP_MODE, key, pbeParams);
|
||||
} else {
|
||||
ci.init(Cipher.UNWRAP_MODE, key, aps);
|
||||
}
|
||||
|
||||
Key unwrappedKey = ci.unwrap(keyWrapper, algo, Cipher.SECRET_KEY);
|
||||
|
||||
if ((keyAlgo.endsWith("TRIPLEDES")
|
||||
|| keyAlgo.endsWith("AES_256")) && !isUnlimited) {
|
||||
out.print(
|
||||
"Expected InvalidKeyException not thrown");
|
||||
return false;
|
||||
}
|
||||
|
||||
return (Arrays.equals(key.getEncoded(), unwrappedKey.getEncoded()));
|
||||
|
||||
} catch (InvalidKeyException ex) {
|
||||
|
||||
if ((keyAlgo.endsWith("TRIPLEDES")
|
||||
|| keyAlgo.endsWith("AES_256")) && !isUnlimited) {
|
||||
out.print(
|
||||
"Expected InvalidKeyException thrown");
|
||||
return true;
|
||||
} else {
|
||||
throw ex;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue