diff options
Diffstat (limited to 'src/lib/libcrypto/rsa/rsa_pmeth.c')
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_pmeth.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_pmeth.c b/src/lib/libcrypto/rsa/rsa_pmeth.c index 09166e105b..0b648138ee 100644 --- a/src/lib/libcrypto/rsa/rsa_pmeth.c +++ b/src/lib/libcrypto/rsa/rsa_pmeth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_pmeth.c,v 1.16 2015/02/11 04:05:14 beck Exp $ */ | 1 | /* $OpenBSD: rsa_pmeth.c,v 1.17 2015/06/20 01:07:25 doug Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -178,18 +178,7 @@ pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, | |||
178 | return -1; | 178 | return -1; |
179 | } | 179 | } |
180 | 180 | ||
181 | if (EVP_MD_type(rctx->md) == NID_mdc2) { | 181 | if (rctx->pad_mode == RSA_X931_PADDING) { |
182 | unsigned int sltmp; | ||
183 | |||
184 | if (rctx->pad_mode != RSA_PKCS1_PADDING) | ||
185 | return -1; | ||
186 | ret = RSA_sign_ASN1_OCTET_STRING(NID_mdc2, tbs, tbslen, | ||
187 | sig, &sltmp, rsa); | ||
188 | |||
189 | if (ret <= 0) | ||
190 | return ret; | ||
191 | ret = sltmp; | ||
192 | } else if (rctx->pad_mode == RSA_X931_PADDING) { | ||
193 | if (!setup_tbuf(rctx, ctx)) | 182 | if (!setup_tbuf(rctx, ctx)) |
194 | return -1; | 183 | return -1; |
195 | memcpy(rctx->tbuf, tbs, tbslen); | 184 | memcpy(rctx->tbuf, tbs, tbslen); |