diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-02 00:49:35 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-12-07 17:40:20 +0100 |
| commit | bfb0641f932490c2e7fb5f9f7cb4a88017a5abfa (patch) | |
| tree | 6b6b0a9dfe55b4b3a2e5961ed1778dd156128f35 /crypto/pem | |
| parent | Cleanup: rename EVP_MD_CTX_(create|init|destroy) to EVP_MD_CTX_(new|reset|free) (diff) | |
| download | openssl-bfb0641f932490c2e7fb5f9f7cb4a88017a5abfa.tar.xz openssl-bfb0641f932490c2e7fb5f9f7cb4a88017a5abfa.zip | |
Cleanup: fix all sources that used EVP_MD_CTX_(create|init|destroy)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pem_seal.c | 4 | ||||
| -rw-r--r-- | crypto/pem/pvkfmt.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/pem/pem_seal.c b/crypto/pem/pem_seal.c index 5d9c5975fe..d0db777832 100644 --- a/crypto/pem/pem_seal.c +++ b/crypto/pem/pem_seal.c @@ -93,7 +93,7 @@ int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type, EVP_EncodeInit(&ctx->encode); - ctx->md = EVP_MD_CTX_create(); + ctx->md = EVP_MD_CTX_new(); if (!EVP_SignInit(ctx->md, md_type)) goto err; @@ -178,7 +178,7 @@ int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl, ret = 1; err: - EVP_MD_CTX_destroy(ctx->md); + EVP_MD_CTX_free(ctx->md); EVP_CIPHER_CTX_cleanup(&ctx->cipher); OPENSSL_free(s); return (ret); diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c index f062728932..c95967cae1 100644 --- a/crypto/pem/pvkfmt.c +++ b/crypto/pem/pvkfmt.c @@ -650,7 +650,7 @@ static int derive_pvk_key(unsigned char *key, const unsigned char *salt, unsigned int saltlen, const unsigned char *pass, int passlen) { - EVP_MD_CTX *mctx = EVP_MD_CTX_create();; + EVP_MD_CTX *mctx = EVP_MD_CTX_new();; int rv = 1; if (mctx == NULL || !EVP_DigestInit_ex(mctx, EVP_sha1(), NULL) @@ -659,7 +659,7 @@ static int derive_pvk_key(unsigned char *key, || !EVP_DigestFinal_ex(mctx, key, NULL)) rv = 0; - EVP_MD_CTX_destroy(mctx); + EVP_MD_CTX_free(mctx); return rv; } |