Changeset 0b85bff for core

Timestamp:

Jul 13, 2017 3:53:00 PM (3 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

d4a139f2

Parents:

5ddb4ed

Message:

Crypto: Preserve CRT parameters for RSA private keys (ticket #2005)

Location:

core/java/src/net/i2p/crypto

Files:

• RSASigningPrivateCrtKey.java (added)
• SigUtil.java (modified) (5 diffs)

core/java/src/net/i2p/crypto/SigUtil.java

@@ -18 +18 @@
 import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPrivateCrtKey;
 import java.security.interfaces.RSAPublicKey;
 import java.security.spec.AlgorithmParameterSpec;
@@ -445 +446 @@
 
     /**
-     *
+     *  As of 0.9.31, if pk is a RSASigningPrivateCrtKey,
+     *  this will return a RSAPrivateCrtKey.
      */
     public static RSAPrivateKey toJavaRSAKey(SigningPrivateKey pk)
                               throws GeneralSecurityException {
+        if (pk instanceof RSASigningPrivateCrtKey)
+            return ((RSASigningPrivateCrtKey) pk).toJavaKey();
         KeyFactory kf = KeyFactory.getInstance("RSA");
         // private key is modulus (pubkey) + exponent
@@ -469 +473 @@
 
     /**
-     *  @deprecated unused
+     *  As of 0.9.31, if pk is a RSAPrivateCrtKey,
+     *  this will return a RSASigningPrivateCrtKey.
      */
     public static SigningPrivateKey fromJavaKey(RSAPrivateKey pk, SigType type)
@@ -477 +482 @@
         BigInteger d = pk.getPrivateExponent();
         byte[] b = combine(n, d, type.getPrivkeyLen());
+        if (pk instanceof RSAPrivateCrtKey)
+            return RSASigningPrivateCrtKey.fromJavaKey((RSAPrivateCrtKey) pk);
         return new SigningPrivateKey(type, b);
     }
@@ -570 +577 @@
      *  Combine two BigIntegers of nominal length = len / 2
      *  @return array of exactly len bytes
-     *  @since 0.9.9
-     */
-    private static byte[] combine(BigInteger x, BigInteger y, int len)
+     *  @since 0.9.9, package private since 0.9.31
+     */
+    static byte[] combine(BigInteger x, BigInteger y, int len)
                               throws InvalidKeyException {
         if ((len & 0x01) != 0)