diff options
author | miod <> | 2014-07-11 15:21:51 +0000 |
---|---|---|
committer | miod <> | 2014-07-11 15:21:51 +0000 |
commit | ae97a6ab623f3ff87143530d86559eca7ed147aa (patch) | |
tree | e1cbff2655b487f44b55930e1c58fa28837a8b32 /src/lib | |
parent | fbfe45dd95392fba92a3cd5e266edd9fbe7159b5 (diff) | |
download | openbsd-ae97a6ab623f3ff87143530d86559eca7ed147aa.tar.gz openbsd-ae97a6ab623f3ff87143530d86559eca7ed147aa.tar.bz2 openbsd-ae97a6ab623f3ff87143530d86559eca7ed147aa.zip |
In RSA_eay_private_encrypt(), correctly return the smaller BN; OpenSSL
PR #3418 via OpenSSL trunk
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_eay.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_eay.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index 571a9a0f05..d76ff69208 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_eay.c,v 1.34 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_eay.c,v 1.35 2014/07/11 15:21:51 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -452,7 +452,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to, | |||
452 | 452 | ||
453 | if (padding == RSA_X931_PADDING) { | 453 | if (padding == RSA_X931_PADDING) { |
454 | BN_sub(f, rsa->n, ret); | 454 | BN_sub(f, rsa->n, ret); |
455 | if (BN_cmp(ret, f)) | 455 | if (BN_cmp(ret, f) > 0) |
456 | res = f; | 456 | res = f; |
457 | else | 457 | else |
458 | res = ret; | 458 | res = ret; |
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_eay.c b/src/lib/libssl/src/crypto/rsa/rsa_eay.c index 571a9a0f05..d76ff69208 100644 --- a/src/lib/libssl/src/crypto/rsa/rsa_eay.c +++ b/src/lib/libssl/src/crypto/rsa/rsa_eay.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_eay.c,v 1.34 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_eay.c,v 1.35 2014/07/11 15:21:51 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -452,7 +452,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to, | |||
452 | 452 | ||
453 | if (padding == RSA_X931_PADDING) { | 453 | if (padding == RSA_X931_PADDING) { |
454 | BN_sub(f, rsa->n, ret); | 454 | BN_sub(f, rsa->n, ret); |
455 | if (BN_cmp(ret, f)) | 455 | if (BN_cmp(ret, f) > 0) |
456 | res = f; | 456 | res = f; |
457 | else | 457 | else |
458 | res = ret; | 458 | res = ret; |