diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-13 17:44:54 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-21 09:04:13 +0200 |
| commit | 6d1f50b520ce0a2eaa624686a26ffd4a5af00d93 (patch) | |
| tree | d094306e91bd79803bb49a9323ec36bd122ecb4e /crypto/crmf/crmf_pbm.c | |
| parent | cac30a69bcadcfcf5beb034abf958bbcdb8b83cb (diff) | |
Use in CMP+CRMF libctx and propq param added to sign/verify/HMAC/decrypt
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11808)
Diffstat (limited to 'crypto/crmf/crmf_pbm.c')
| -rw-r--r-- | crypto/crmf/crmf_pbm.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/crypto/crmf/crmf_pbm.c b/crypto/crmf/crmf_pbm.c index 77ef6e0a37..3aedf8b57f 100644 --- a/crypto/crmf/crmf_pbm.c +++ b/crypto/crmf/crmf_pbm.c @@ -122,14 +122,16 @@ OSSL_CRMF_PBMPARAMETER *OSSL_CRMF_pbmp_new(OPENSSL_CTX *libctx, size_t slen, * |maclen| if not NULL, will set variable to the length of the mac on success * returns 1 on success, 0 on error */ -int OSSL_CRMF_pbm_new(const OSSL_CRMF_PBMPARAMETER *pbmp, +/* TODO try to combine with other MAC calculations in the libray */ +int OSSL_CRMF_pbm_new(OPENSSL_CTX *libctx, const char *propq, + const OSSL_CRMF_PBMPARAMETER *pbmp, const unsigned char *msg, size_t msglen, const unsigned char *sec, size_t seclen, unsigned char **out, size_t *outlen) { int mac_nid, hmac_md_nid = NID_undef; - const char *mdname = NULL; - const EVP_MD *m = NULL; + const char *mdname; + EVP_MD *owf = NULL; EVP_MD_CTX *ctx = NULL; unsigned char basekey[EVP_MAX_MD_SIZE]; unsigned int bklen = EVP_MAX_MD_SIZE; @@ -153,7 +155,8 @@ int OSSL_CRMF_pbm_new(const OSSL_CRMF_PBMPARAMETER *pbmp, * compute the key used in the MAC process. All implementations MUST * support SHA-1. */ - if ((m = EVP_get_digestbyobj(pbmp->owf->algorithm)) == NULL) { + mdname = OBJ_nid2sn(OBJ_obj2nid(pbmp->owf->algorithm)); + if ((owf = EVP_MD_fetch(libctx, mdname, propq)) == NULL) { CRMFerr(CRMF_F_OSSL_CRMF_PBM_NEW, CRMF_R_UNSUPPORTED_ALGORITHM); goto err; } @@ -162,7 +165,7 @@ int OSSL_CRMF_pbm_new(const OSSL_CRMF_PBMPARAMETER *pbmp, goto err; /* compute the basekey of the salted secret */ - if (!EVP_DigestInit_ex(ctx, m, NULL)) + if (!EVP_DigestInit_ex(ctx, owf, NULL)) goto err; /* first the secret */ if (!EVP_DigestUpdate(ctx, sec, seclen)) @@ -181,7 +184,7 @@ int OSSL_CRMF_pbm_new(const OSSL_CRMF_PBMPARAMETER *pbmp, /* the first iteration was already done above */ while (--iterations > 0) { - if (!EVP_DigestInit_ex(ctx, m, NULL)) + if (!EVP_DigestInit_ex(ctx, owf, NULL)) goto err; if (!EVP_DigestUpdate(ctx, basekey, bklen)) goto err; @@ -206,7 +209,7 @@ int OSSL_CRMF_pbm_new(const OSSL_CRMF_PBMPARAMETER *pbmp, (char *)mdname, 0); macparams[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, basekey, bklen); - if ((mac = EVP_MAC_fetch(NULL, "HMAC", NULL)) == NULL + if ((mac = EVP_MAC_fetch(libctx, "HMAC", propq)) == NULL || (mctx = EVP_MAC_CTX_new(mac)) == NULL || !EVP_MAC_CTX_set_params(mctx, macparams) || !EVP_MAC_init(mctx) @@ -217,10 +220,10 @@ int OSSL_CRMF_pbm_new(const OSSL_CRMF_PBMPARAMETER *pbmp, ok = 1; err: - /* cleanup */ OPENSSL_cleanse(basekey, bklen); EVP_MAC_CTX_free(mctx); EVP_MAC_free(mac); + EVP_MD_free(owf); EVP_MD_CTX_free(ctx); if (ok == 1) { |