From 2afb29b480d87c4c24f830e69dfe82762e3db608 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 14 Aug 2014 16:47:13 -0400 Subject: [PATCH] RT992: RSA_check_key should have a callback arg The original RT request included a patch. By the time we got around to doing it, however, the callback scheme had changed. So I wrote a new function RSA_check_key_ex() that uses the BN_GENCB callback. But thanks very much to Vinet Sharma for the initial implementation. Reviewed-by: Dr. Stephen Henson --- crypto/rsa/rsa.h | 1 + crypto/rsa/rsa_chk.c | 9 +++++++-- doc/crypto/BN_generate_prime.pod | 4 ++-- doc/crypto/RSA_check_key.pod | 34 +++++++++++++++++++++----------- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h index 543deaf572..d74719f57e 100644 --- a/crypto/rsa/rsa.h +++ b/crypto/rsa/rsa.h @@ -325,6 +325,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1, BIGNUM *q2, int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e, BN_GENCB *cb); int RSA_check_key(const RSA *); +int RSA_check_key_ex(const RSA *, BN_GENCB *cb); /* next 4 return -1 on error */ int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa,int padding); diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c index cc30e77132..a351e6dee4 100644 --- a/crypto/rsa/rsa_chk.c +++ b/crypto/rsa/rsa_chk.c @@ -54,6 +54,11 @@ int RSA_check_key(const RSA *key) + { + return RSA_check_key_ex(key, NULL); + } + +int RSA_check_key_ex(const RSA *key, BN_GENCB *cb) { BIGNUM *i, *j, *k, *l, *m; BN_CTX *ctx; @@ -81,7 +86,7 @@ int RSA_check_key(const RSA *key) } /* p prime? */ - r = BN_is_prime_ex(key->p, BN_prime_checks, NULL, NULL); + r = BN_is_prime_ex(key->p, BN_prime_checks, NULL, cb); if (r != 1) { ret = r; @@ -91,7 +96,7 @@ int RSA_check_key(const RSA *key) } /* q prime? */ - r = BN_is_prime_ex(key->q, BN_prime_checks, NULL, NULL); + r = BN_is_prime_ex(key->q, BN_prime_checks, NULL, cb); if (r != 1) { ret = r; diff --git a/doc/crypto/BN_generate_prime.pod b/doc/crypto/BN_generate_prime.pod index f1f2265a86..4522fa9bdb 100644 --- a/doc/crypto/BN_generate_prime.pod +++ b/doc/crypto/BN_generate_prime.pod @@ -104,10 +104,10 @@ programs should prefer the "new" style, whilst the "old" style is provided for backwards compatibility purposes. For "new" style callbacks a BN_GENCB structure should be initialised with a -call to BN_GENCB_set, where B is a B, B is of +call to BN_GENCB_set(), where B is a B, B is of type B and B is a B. "Old" style callbacks are the same except they are initialised with a call -to BN_GENCB_set_old and B is of type +to BN_GENCB_set_old() and B is of type B. A callback is invoked through a call to B. This will check diff --git a/doc/crypto/RSA_check_key.pod b/doc/crypto/RSA_check_key.pod index a5198f3db5..522a6c2b5e 100644 --- a/doc/crypto/RSA_check_key.pod +++ b/doc/crypto/RSA_check_key.pod @@ -8,35 +8,42 @@ RSA_check_key - validate private RSA keys #include + int RSA_check_key_ex(RSA *rsa, BN_GENCB *cb); + int RSA_check_key(RSA *rsa); =head1 DESCRIPTION -This function validates RSA keys. It checks that B

and B are +RSA_check_key_ex() function validates RSA keys. +It checks that B

and B are in fact prime, and that B. +It does not work on RSA public keys that have only the modulus +and public exponent elements populated. It also checks that B, and that B, B and B are set correctly or are B. +It performs integrity checks on all +the RSA key material, so the RSA key structure must contain all the private +key data too. +Therefore, it cannot be used with any arbitrary RSA key object, +even if it is otherwise fit for regular RSA operation. + +The B parameter is a callback that will be invoked in the same +manner as L. -As such, this function can not be used with any arbitrary RSA key object, -even if it is otherwise fit for regular RSA operation. See B for more -information. +RSA_check_key() is equivalent to RSA_check_key_ex() with a NULL B. =head1 RETURN VALUE -RSA_check_key() returns 1 if B is a valid RSA key, and 0 otherwise. --1 is returned if an error occurs while checking the key. +RSA_check_key_ex() and RSA_check_key() +return 1 if B is a valid RSA key, and 0 otherwise. +They return -1 if an error occurs while checking the key. If the key is invalid or an error occurred, the reason code can be obtained using L. =head1 NOTES -This function does not work on RSA public keys that have only the modulus -and public exponent elements populated. It performs integrity checks on all -the RSA key material, so the RSA key structure must contain all the private -key data too. - Unlike most other RSA functions, this function does B work transparently with any underlying ENGINE implementation because it uses the key data in the RSA structure directly. An ENGINE implementation can @@ -58,10 +65,13 @@ provide their own verifiers. =head1 SEE ALSO -L, L +L, +L, +L =head1 HISTORY RSA_check_key() appeared in OpenSSL 0.9.4. +RSA_check_key_ex() appeared after OpenSSL 1.0.2. =cut -- 2.34.1