From c80f7f1fcd0ab38d94d8c61c6d110b6a1a3c7481 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Mon, 30 Jul 2012 14:58:29 -0400 Subject: [PATCH] removed keystore dependency where it is not needed --- .../src/test/java/org/mitre/jwt/JwtTest.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/openid-connect-server/src/test/java/org/mitre/jwt/JwtTest.java b/openid-connect-server/src/test/java/org/mitre/jwt/JwtTest.java index 208e28e57..b20195904 100644 --- a/openid-connect-server/src/test/java/org/mitre/jwt/JwtTest.java +++ b/openid-connect-server/src/test/java/org/mitre/jwt/JwtTest.java @@ -130,22 +130,6 @@ public class JwtTest { PublicKey publicKey = keyFactory.generatePublic(publicSpec); - // BC sez X509V3CertificateGenerator is deprecated and the docs say to - // use another, but it seemingly isn't included jar... - X509V3CertificateGenerator v3CertGen = createCertificate("testGenerateRsaSignature", 30, 30); - - v3CertGen.setPublicKey(publicKey); - v3CertGen.setSignatureAlgorithm("SHA256WithRSAEncryption"); - - // BC docs say to use another, but it seemingly isn't included... - X509Certificate certificate = v3CertGen.generateX509Certificate(privateKey); - - // if exist, overwrite - java.security.KeyStore ks = keystore.getKeystore(); - ks.setKeyEntry("testGenerateRsaSignature", privateKey, RsaSigner.DEFAULT_PASSWORD.toCharArray(), new java.security.cert.Certificate[] { certificate }); - - keystore.setKeystore(ks); - Jwt jwt = new Jwt(); jwt.getHeader().setType("JWT"); jwt.getHeader().setAlgorithm("RS256"); @@ -153,7 +137,7 @@ public class JwtTest { jwt.getClaims().setIssuer("joe"); jwt.getClaims().setClaim("http://example.com/is_root", Boolean.TRUE); - JwtSigner signer = new RsaSigner(JwsAlgorithm.RS256.getJwaName(), keystore, "testGenerateRsaSignature", RsaSigner.DEFAULT_PASSWORD); + JwtSigner signer = new RsaSigner(JwsAlgorithm.RS256.getJwaName(), publicKey, privateKey); ((RsaSigner) signer).afterPropertiesSet(); /*