Implement engineGetKeySize() in Ciphers. (#327)
* Implement engineGetKeySize() in Ciphers.
This method is only called when the unlimited strength policy files aren't
installed, and thus the JDK needs to check whether the key sizes being
used are allowed, but it causes an UnsupportedOperationException if it's
missing in that situation.
Fixes #324.
* Simplify chained if statements.
diff --git a/common/src/main/java/org/conscrypt/OpenSSLCipher.java b/common/src/main/java/org/conscrypt/OpenSSLCipher.java
index b44bf45..51a8b68 100644
--- a/common/src/main/java/org/conscrypt/OpenSSLCipher.java
+++ b/common/src/main/java/org/conscrypt/OpenSSLCipher.java
@@ -422,6 +422,20 @@
}
}
+ @Override
+ protected int engineGetKeySize(Key key) throws InvalidKeyException {
+ if (!(key instanceof SecretKey)) {
+ throw new InvalidKeyException("Only SecretKey is supported");
+ }
+ byte[] encodedKey = key.getEncoded();
+ if (encodedKey == null) {
+ throw new InvalidKeyException("key.getEncoded() == null");
+ }
+ checkSupportedKeySize(encodedKey.length);
+ // The return value is in bits
+ return encodedKey.length * 8;
+ }
+
private byte[] checkAndSetEncodedKey(int opmode, Key key) throws InvalidKeyException {
if (opmode == Cipher.ENCRYPT_MODE || opmode == Cipher.WRAP_MODE) {
encrypting = true;
diff --git a/common/src/main/java/org/conscrypt/OpenSSLCipherRSA.java b/common/src/main/java/org/conscrypt/OpenSSLCipherRSA.java
index 9ce37e7..1784b97 100644
--- a/common/src/main/java/org/conscrypt/OpenSSLCipherRSA.java
+++ b/common/src/main/java/org/conscrypt/OpenSSLCipherRSA.java
@@ -216,6 +216,29 @@
}
@Override
+ protected int engineGetKeySize(Key key) throws InvalidKeyException {
+ if (key instanceof OpenSSLRSAPrivateKey) {
+ return ((OpenSSLRSAPrivateKey) key).getModulus().bitLength();
+ }
+ if (key instanceof RSAPrivateCrtKey) {
+ return ((RSAPrivateCrtKey) key).getModulus().bitLength();
+ }
+ if (key instanceof RSAPrivateKey) {
+ return ((RSAPrivateKey) key).getModulus().bitLength();
+ }
+ if (key instanceof OpenSSLRSAPublicKey) {
+ return ((OpenSSLRSAPublicKey) key).getModulus().bitLength();
+ }
+ if (key instanceof RSAPublicKey) {
+ return ((RSAPublicKey) key).getModulus().bitLength();
+ }
+ if (null == key) {
+ throw new InvalidKeyException("RSA private or public key is null");
+ }
+ throw new InvalidKeyException("Need RSA private or public key");
+ }
+
+ @Override
protected void engineInit(int opmode, Key key, SecureRandom random) throws InvalidKeyException {
try {
engineInitInternal(opmode, key, null);
