diff options
| author |   jsing <jsing@openbsd.org> | 2016-12-30 15:47:07 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-12-30 15:47:07 +0000 |
| commit | 949fc86510e53a3f6b855bbed1c1db87e4ec4c01 (patch) | |
| tree | 2704a9617d92d60fe294d0a996134a5640ec1fce | |
| parent | Expand ASN1_ITEM_rptr macros - no change in generated assembly. (diff) | |
| download | wireguard-openbsd-949fc86510e53a3f6b855bbed1c1db87e4ec4c01.tar.xz wireguard-openbsd-949fc86510e53a3f6b855bbed1c1db87e4ec4c01.zip | |
Expand ASN1_ITEM_rptr macros - no change in generated assembly.
| -rw-r--r-- | lib/libcrypto/rsa/rsa_ameth.c | 6 | ||||
| -rw-r--r-- | lib/libcrypto/rsa/rsa_asn1.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libcrypto/rsa/rsa_ameth.c b/lib/libcrypto/rsa/rsa_ameth.c index 8faddcee1cd..aa911251cc9 100644 --- a/lib/libcrypto/rsa/rsa_ameth.c +++ b/lib/libcrypto/rsa/rsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_ameth.c,v 1.16 2016/10/19 16:49:11 jsing Exp $ */ +/* $OpenBSD: rsa_ameth.c,v 1.17 2016/12/30 15:47:07 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -588,7 +588,7 @@ rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, /* need to embed algorithm ID inside another */ mgf1alg = X509_ALGOR_new(); X509_ALGOR_set_md(mgf1alg, mgf1md); - if (!ASN1_item_pack(mgf1alg, ASN1_ITEM_rptr(X509_ALGOR), + if (!ASN1_item_pack(mgf1alg, &X509_ALGOR_it, &stmp)) goto err; pss->maskGenAlgorithm = X509_ALGOR_new(); @@ -598,7 +598,7 @@ rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, OBJ_nid2obj(NID_mgf1), V_ASN1_SEQUENCE, stmp); } /* Finally create string with pss parameter encoding. */ - if (!ASN1_item_pack(pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), &os1)) + if (!ASN1_item_pack(pss, &RSA_PSS_PARAMS_it, &os1)) goto err; if (alg2) { os2 = ASN1_STRING_dup(os1); diff --git a/lib/libcrypto/rsa/rsa_asn1.c b/lib/libcrypto/rsa/rsa_asn1.c index 27afdece008..f931a93e85e 100644 --- a/lib/libcrypto/rsa/rsa_asn1.c +++ b/lib/libcrypto/rsa/rsa_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_asn1.c,v 1.12 2015/02/14 15:06:55 jsing Exp $ */ +/* $OpenBSD: rsa_asn1.c,v 1.13 2016/12/30 15:47:07 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -298,11 +298,11 @@ i2d_RSAPublicKey(const RSA *a, unsigned char **out) RSA * RSAPublicKey_dup(RSA *rsa) { - return ASN1_item_dup(ASN1_ITEM_rptr(RSAPublicKey), rsa); + return ASN1_item_dup(&RSAPublicKey_it, rsa); } RSA * RSAPrivateKey_dup(RSA *rsa) { - return ASN1_item_dup(ASN1_ITEM_rptr(RSAPrivateKey), rsa); + return ASN1_item_dup(&RSAPrivateKey_it, rsa); } |