Changeset f168918

Timestamp:

Nov 30, 2018 3:56:27 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

922515df

Parents:

2487bca

Message:

Data: Check data length in typed constructors
Check for type match in KeyPair?
Mark placeholder EncTypes? 1-3 as unavailable

Location:

core/java/src/net/i2p

Files:

• crypto/EncType.java (modified) (1 diff)
• crypto/KeyPair.java (modified) (1 diff)
• data/PrivateKey.java (modified) (1 diff)
• data/PublicKey.java (modified) (1 diff)

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

@@ -114 +114 @@
         if (ELGAMAL_2048 == this)
             return true;
+        // EC types are placeholders for now
+        if (base == EncAlgo.EC)
+            return false;
         try {
             getParams();

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

@@ -14 +14 @@
     private final PrivateKey priv;
 
+    /**
+     * @param publicKey non-null, same EncType as privateKey
+     * @param privateKey non-null, same EncType as publicKey
+     */
     public KeyPair(PublicKey publicKey, PrivateKey privateKey) {
         pub = publicKey;
         priv = privateKey;
+        if (pub.getType() != priv.getType())
+            throw new IllegalArgumentException();
     }
 

core/java/src/net/i2p/data/PrivateKey.java

@@ -54 +54 @@
      */
     public PrivateKey(EncType type, byte data[]) {
-        super();
-        _type = type;
+        this(type);
         if (data == null)
             throw new IllegalArgumentException("Data must be specified");
-        _data = data;
+        setData(data);
     }
 

core/java/src/net/i2p/data/PublicKey.java

@@ -77 +77 @@
      */
     public PublicKey(EncType type, byte data[]) {
-        super();
-        _type = type;
+        this(type);
         if (data == null)
             throw new IllegalArgumentException("Data must be specified");
-        _data = data;
+        setData(data);
     }