You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2019/12/27 06:30:42 UTC
[directory-kerby] branch trunk updated: Change test keys to be 2048
bits.
This is an automated email from the ASF dual-hosted git repository.
plusplusjiajia pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/directory-kerby.git
The following commit(s) were added to refs/heads/trunk by this push:
new 01a1dd4 Change test keys to be 2048 bits.
01a1dd4 is described below
commit 01a1dd45fa261b97701bfd1fbbbaa79ca2d3ce09
Author: Li, Jiajia <ji...@intel.com>
AuthorDate: Fri Dec 27 14:14:59 2019 +0800
Change test keys to be 2048 bits.
---
.../src/test/java/org/apache/kerby/has/server/TestUtil.java | 2 +-
.../java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java | 2 ++
.../java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java | 2 ++
.../kerby/kerberos/kerb/integration/test/JWTTokenTest.java | 9 +++++++--
.../java/org/apache/kerby/kerberos/provider/token/TokenTest.java | 1 +
.../kerberos/tool/admin/local/cmd/DeployHTTPSCertsCommand.java | 2 +-
6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestUtil.java b/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestUtil.java
index c40a8f2..6c52d11 100644
--- a/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestUtil.java
+++ b/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestUtil.java
@@ -126,7 +126,7 @@ class TestUtil {
private static KeyPair generateKeyPair(String algorithm) throws NoSuchAlgorithmException {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance(algorithm);
- keyGen.initialize(1024);
+ keyGen.initialize(2048);
return keyGen.genKeyPair();
}
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java
index 3b1e59d..96762d8 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/AccessTokenKdcTest.java
@@ -95,6 +95,7 @@ public class AccessTokenKdcTest extends TokenKdcTestBase {
@Test
public void testSignedTokenWithABadKey() throws Exception {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+ keyGen.initialize(2048);
KeyPair keyPair = keyGen.generateKeyPair();
prepareToken(getServerPrincipal(), ISSUER, keyPair.getPrivate(), null);
@@ -126,6 +127,7 @@ public class AccessTokenKdcTest extends TokenKdcTestBase {
@Test
public void testSignedEncryptedTokenBadSigningKey() throws Exception {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+ keyGen.initialize(2048);
KeyPair keyPair = keyGen.generateKeyPair();
PublicKey publicKey;
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java
index cfbabe3..57e7627 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/IdentityTokenKdcTest.java
@@ -94,6 +94,7 @@ public class IdentityTokenKdcTest extends TokenKdcTestBase {
@Test
public void testSignedTokenWithABadKey() throws Exception {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+ keyGen.initialize(2048);
KeyPair keyPair = keyGen.generateKeyPair();
prepareToken(getAudience("krbtgt"), ISSUER, keyPair.getPrivate(), null);
@@ -126,6 +127,7 @@ public class IdentityTokenKdcTest extends TokenKdcTestBase {
@Test
public void testSignedEncryptedTokenBadSigningKey() throws Exception {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+ keyGen.initialize(2048);
KeyPair keyPair = keyGen.generateKeyPair();
PublicKey publicKey;
diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java
index 12da053..1f85b4f 100644
--- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java
+++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/JWTTokenTest.java
@@ -206,7 +206,10 @@ public class JWTTokenTest extends TokenLoginTestBase {
authToken.setAudiences(Collections.singletonList(getServerPrincipal()));
KrbToken krbToken = new KrbToken(authToken, TokenFormat.JWT);
- KeyPair keyPair = KeyPairGenerator.getInstance("RSA").generateKeyPair();
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+ kpg.initialize(2048);
+ KeyPair keyPair = kpg.generateKeyPair();
+
krbToken.setTokenValue(signToken(authToken, keyPair.getPrivate()));
// Now get a SGT using the JWT
@@ -463,7 +466,9 @@ public class JWTTokenTest extends TokenLoginTestBase {
authToken.setAudiences(Collections.singletonList(authToken.getAudiences().get(0) + "_"));
KrbToken krbToken = new KrbToken(authToken, TokenFormat.JWT);
- KeyPair keyPair = KeyPairGenerator.getInstance("RSA").generateKeyPair();
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+ kpg.initialize(2048);
+ KeyPair keyPair = kpg.generateKeyPair();
krbToken.setTokenValue(signToken(authToken, keyPair.getPrivate()));
// Now get a TGT using the JWT token
diff --git a/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java b/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java
index 2a93f32..bb7341d 100644
--- a/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java
+++ b/kerby-provider/token-provider/src/test/java/org/apache/kerby/kerberos/provider/token/TokenTest.java
@@ -327,6 +327,7 @@ public class TokenTest {
private KeyPair getKeyPair() throws NoSuchAlgorithmException {
KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+ kpg.initialize(2048);
return kpg.generateKeyPair();
}
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/local/cmd/DeployHTTPSCertsCommand.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/local/cmd/DeployHTTPSCertsCommand.java
index c7d1e1a..4c36c55 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/local/cmd/DeployHTTPSCertsCommand.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/admin/local/cmd/DeployHTTPSCertsCommand.java
@@ -76,7 +76,7 @@ public class DeployHTTPSCertsCommand extends HadminCommand {
private static KeyPair generateKeyPair() throws NoSuchAlgorithmException {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
- keyGen.initialize(1024);
+ keyGen.initialize(2048);
return keyGen.genKeyPair();
}