diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_ameth.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_asn1.c | 6 | 
2 files changed, 6 insertions, 6 deletions
| diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c index 8faddcee1c..aa911251cc 100644 --- a/src/lib/libcrypto/rsa/rsa_ameth.c +++ b/src/lib/libcrypto/rsa/rsa_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_ameth.c,v 1.16 2016/10/19 16:49:11 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_ameth.c,v 1.17 2016/12/30 15:47:07 jsing 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 | */ | 
| @@ -588,7 +588,7 @@ rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, | |||
| 588 | /* need to embed algorithm ID inside another */ | 588 | /* need to embed algorithm ID inside another */ | 
| 589 | mgf1alg = X509_ALGOR_new(); | 589 | mgf1alg = X509_ALGOR_new(); | 
| 590 | X509_ALGOR_set_md(mgf1alg, mgf1md); | 590 | X509_ALGOR_set_md(mgf1alg, mgf1md); | 
| 591 | if (!ASN1_item_pack(mgf1alg, ASN1_ITEM_rptr(X509_ALGOR), | 591 | if (!ASN1_item_pack(mgf1alg, &X509_ALGOR_it, | 
| 592 | &stmp)) | 592 | &stmp)) | 
| 593 | goto err; | 593 | goto err; | 
| 594 | pss->maskGenAlgorithm = X509_ALGOR_new(); | 594 | pss->maskGenAlgorithm = X509_ALGOR_new(); | 
| @@ -598,7 +598,7 @@ rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, | |||
| 598 | OBJ_nid2obj(NID_mgf1), V_ASN1_SEQUENCE, stmp); | 598 | OBJ_nid2obj(NID_mgf1), V_ASN1_SEQUENCE, stmp); | 
| 599 | } | 599 | } | 
| 600 | /* Finally create string with pss parameter encoding. */ | 600 | /* Finally create string with pss parameter encoding. */ | 
| 601 | if (!ASN1_item_pack(pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), &os1)) | 601 | if (!ASN1_item_pack(pss, &RSA_PSS_PARAMS_it, &os1)) | 
| 602 | goto err; | 602 | goto err; | 
| 603 | if (alg2) { | 603 | if (alg2) { | 
| 604 | os2 = ASN1_STRING_dup(os1); | 604 | os2 = ASN1_STRING_dup(os1); | 
| diff --git a/src/lib/libcrypto/rsa/rsa_asn1.c b/src/lib/libcrypto/rsa/rsa_asn1.c index 27afdece00..f931a93e85 100644 --- a/src/lib/libcrypto/rsa/rsa_asn1.c +++ b/src/lib/libcrypto/rsa/rsa_asn1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_asn1.c,v 1.12 2015/02/14 15:06:55 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_asn1.c,v 1.13 2016/12/30 15:47:07 jsing 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 2000. | 3 | * project 2000. | 
| 4 | */ | 4 | */ | 
| @@ -298,11 +298,11 @@ i2d_RSAPublicKey(const RSA *a, unsigned char **out) | |||
| 298 | RSA * | 298 | RSA * | 
| 299 | RSAPublicKey_dup(RSA *rsa) | 299 | RSAPublicKey_dup(RSA *rsa) | 
| 300 | { | 300 | { | 
| 301 | return ASN1_item_dup(ASN1_ITEM_rptr(RSAPublicKey), rsa); | 301 | return ASN1_item_dup(&RSAPublicKey_it, rsa); | 
| 302 | } | 302 | } | 
| 303 | 303 | ||
| 304 | RSA * | 304 | RSA * | 
| 305 | RSAPrivateKey_dup(RSA *rsa) | 305 | RSAPrivateKey_dup(RSA *rsa) | 
| 306 | { | 306 | { | 
| 307 | return ASN1_item_dup(ASN1_ITEM_rptr(RSAPrivateKey), rsa); | 307 | return ASN1_item_dup(&RSAPrivateKey_it, rsa); | 
| 308 | } | 308 | } | 
