diff options
author | kettenis <> | 2008-09-07 15:37:02 +0000 |
---|---|---|
committer | kettenis <> | 2008-09-07 15:37:02 +0000 |
commit | 80904fe512bc90547d8dd18ce75bb40f2d6e0f3a (patch) | |
tree | 08906c97f0c09691a4458bb5d771135836eaf171 /src | |
parent | a18cbcada1b2343d29b46153dbad586fb3185d4b (diff) | |
download | openbsd-80904fe512bc90547d8dd18ce75bb40f2d6e0f3a.tar.gz openbsd-80904fe512bc90547d8dd18ce75bb40f2d6e0f3a.tar.bz2 openbsd-80904fe512bc90547d8dd18ce75bb40f2d6e0f3a.zip |
Fix merge botch.
ok miod@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_eay.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_eay.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index bb77d0f67e..272c5eed18 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c | |||
@@ -361,9 +361,6 @@ static int RSA_eay_private_encrypt(int flen, const unsigned char *from, | |||
361 | int local_blinding = 0; | 361 | int local_blinding = 0; |
362 | BN_BLINDING *blinding = NULL; | 362 | BN_BLINDING *blinding = NULL; |
363 | 363 | ||
364 | BN_init(&f); | ||
365 | BN_init(&ret); | ||
366 | |||
367 | if (BN_num_bits(rsa->n) > OPENSSL_RSA_MAX_MODULUS_BITS) | 364 | if (BN_num_bits(rsa->n) > OPENSSL_RSA_MAX_MODULUS_BITS) |
368 | { | 365 | { |
369 | RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_MODULUS_TOO_LARGE); | 366 | RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_MODULUS_TOO_LARGE); |
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_eay.c b/src/lib/libssl/src/crypto/rsa/rsa_eay.c index bb77d0f67e..272c5eed18 100644 --- a/src/lib/libssl/src/crypto/rsa/rsa_eay.c +++ b/src/lib/libssl/src/crypto/rsa/rsa_eay.c | |||
@@ -361,9 +361,6 @@ static int RSA_eay_private_encrypt(int flen, const unsigned char *from, | |||
361 | int local_blinding = 0; | 361 | int local_blinding = 0; |
362 | BN_BLINDING *blinding = NULL; | 362 | BN_BLINDING *blinding = NULL; |
363 | 363 | ||
364 | BN_init(&f); | ||
365 | BN_init(&ret); | ||
366 | |||
367 | if (BN_num_bits(rsa->n) > OPENSSL_RSA_MAX_MODULUS_BITS) | 364 | if (BN_num_bits(rsa->n) > OPENSSL_RSA_MAX_MODULUS_BITS) |
368 | { | 365 | { |
369 | RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_MODULUS_TOO_LARGE); | 366 | RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, RSA_R_MODULUS_TOO_LARGE); |