diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-24 11:42:23 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-01 10:25:20 +0200 |
| commit | d8652be06e2778e8898453a391deb7253e1a35a2 (patch) | |
| tree | fe40e22edb39642aa7ae633320c1900388f2e7ee /crypto/crmf | |
| parent | Perl util to do with_libctx renaming (diff) | |
| download | openssl-d8652be06e2778e8898453a391deb7253e1a35a2.tar.xz openssl-d8652be06e2778e8898453a391deb7253e1a35a2.zip | |
Run the withlibctx.pl script
Automatically rename all instances of _with_libctx() to _ex() as per
our coding style.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)
Diffstat (limited to 'crypto/crmf')
| -rw-r--r-- | crypto/crmf/crmf_lib.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c index 5a6cdb7e82..3e971c7769 100644 --- a/crypto/crmf/crmf_lib.c +++ b/crypto/crmf/crmf_lib.c @@ -365,10 +365,9 @@ static int create_popo_signature(OSSL_CRMF_POPOSIGNINGKEY *ps, return 0; } - return ASN1_item_sign_with_libctx(ASN1_ITEM_rptr(OSSL_CRMF_CERTREQUEST), - ps->algorithmIdentifier, NULL, - ps->signature, cr, NULL, pkey, digest, - libctx, propq); + return ASN1_item_sign_ex(ASN1_ITEM_rptr(OSSL_CRMF_CERTREQUEST), + ps->algorithmIdentifier, NULL, ps->signature, cr, + NULL, pkey, digest, libctx, propq); } @@ -502,10 +501,9 @@ int OSSL_CRMF_MSGS_verify_popo(const OSSL_CRMF_MSGS *reqs, it = ASN1_ITEM_rptr(OSSL_CRMF_CERTREQUEST); asn = req->certReq; } - if (ASN1_item_verify_with_libctx(it, sig->algorithmIdentifier, - sig->signature, asn, NULL, - X509_PUBKEY_get0(pubkey), - libctx, propq) < 1) + if (ASN1_item_verify_ex(it, sig->algorithmIdentifier, sig->signature, + asn, NULL, X509_PUBKEY_get0(pubkey), libctx, + propq) < 1) return 0; break; case OSSL_CRMF_POPO_KEYENC: @@ -680,7 +678,7 @@ X509 outlen += n; /* convert decrypted certificate from DER to internal ASN.1 structure */ - if ((cert = X509_new_with_libctx(libctx, propq)) == NULL) + if ((cert = X509_new_ex(libctx, propq)) == NULL) goto end; if (d2i_X509(&cert, &p, outlen) == NULL) CRMFerr(CRMF_F_OSSL_CRMF_ENCRYPTEDVALUE_GET1_ENCCERT, |