diff options
| author | djm <> | 2011-11-03 02:34:33 +0000 |
|---|---|---|
| committer | djm <> | 2011-11-03 02:34:33 +0000 |
| commit | 6d0fb3b3bc3c11f7d4831f061e59a06f29d0ec8e (patch) | |
| tree | a8fc08e33aecdd21cb07aa47c8a3a9db715f2ef3 /src/lib/libcrypto/rsa/rsa_eay.c | |
| parent | 509e4c3041a1e04b41603ac8dd4dbc72152b416e (diff) | |
| download | openbsd-6d0fb3b3bc3c11f7d4831f061e59a06f29d0ec8e.tar.gz openbsd-6d0fb3b3bc3c11f7d4831f061e59a06f29d0ec8e.tar.bz2 openbsd-6d0fb3b3bc3c11f7d4831f061e59a06f29d0ec8e.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/rsa/rsa_eay.c')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_eay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index c5eaeeae6b..7c941885f0 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c | |||
| @@ -675,7 +675,7 @@ static int RSA_eay_public_decrypt(int flen, const unsigned char *from, | |||
| 675 | rsa->_method_mod_n)) goto err; | 675 | rsa->_method_mod_n)) goto err; |
| 676 | 676 | ||
| 677 | if ((padding == RSA_X931_PADDING) && ((ret->d[0] & 0xf) != 12)) | 677 | if ((padding == RSA_X931_PADDING) && ((ret->d[0] & 0xf) != 12)) |
| 678 | BN_sub(ret, rsa->n, ret); | 678 | if (!BN_sub(ret, rsa->n, ret)) goto err; |
| 679 | 679 | ||
| 680 | p=buf; | 680 | p=buf; |
| 681 | i=BN_bn2bin(ret,p); | 681 | i=BN_bn2bin(ret,p); |