JDK 1. 3 update

CBitLabs · Oct 5, 2015 · 5a68f56 · 5a68f56
1 parent 4958c36
commit 5a68f56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkix/src/main/jdk1.3/org/bouncycastle/cert/jcajce/JcaX509ExtensionUtils.java b/pkix/src/main/jdk1.3/org/bouncycastle/cert/jcajce/JcaX509ExtensionUtils.java
@@ -89,7 +89,7 @@ public SubjectKeyIdentifier createSubjectKeyIdentifier(
      */
     public SubjectKeyIdentifier createTruncatedSubjectKeyIdentifier(PublicKey publicKey)
     {
-       return super.createSubjectKeyIdentifier(SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
+       return super.createTruncatedSubjectKeyIdentifier(SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
     }
 
     /**

diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/X509ExtensionUtilsTest.java b/pkix/src/test/java/org/bouncycastle/cert/test/X509ExtensionUtilsTest.java
@@ -63,14 +63,14 @@ public void basicTest()
 
         if (!Arrays.areEqual(shaID, ski.getKeyIdentifier()))
         {
-            fail("SHA-1 ID does not match");
+            fail("basic SHA-1 ID does not match");
         }
 
         ski = x509ExtensionUtils.createTruncatedSubjectKeyIdentifier(pubInfo);
 
         if (!Arrays.areEqual(shaTruncID, ski.getKeyIdentifier()))
         {
-            fail("truncated SHA-1 ID does not match");
+            fail("basic truncated SHA-1 ID does not match");
         }
 
         AuthorityKeyIdentifier authKeyId = x509ExtensionUtils.createAuthorityKeyIdentifier(new X509CertificateHolder(v0Cert));
@@ -113,14 +113,14 @@ public void jcaTest()
 
         if (!Arrays.areEqual(shaID, ski.getKeyIdentifier()))
         {
-            fail("SHA-1 ID does not match");
+            fail("jca SHA-1 ID does not match");
         }
 
         ski = x509ExtensionUtils.createTruncatedSubjectKeyIdentifier(key);
 
         if (!Arrays.areEqual(shaTruncID, ski.getKeyIdentifier()))
         {
-            fail("truncated SHA-1 ID does not match");
+            fail("jca truncated SHA-1 ID does not match");
         }
 
         CertificateFactory cFact = CertificateFactory.getInstance("X.509", "BC");
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ public SubjectKeyIdentifier createSubjectKeyIdentifier( @@
          */
         public SubjectKeyIdentifier createTruncatedSubjectKeyIdentifier(PublicKey publicKey)
         {
-           return super.createSubjectKeyIdentifier(SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
+           return super.createTruncatedSubjectKeyIdentifier(SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
         }
         /**
@@ Expand Down @@