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/srp | |
| parent | 959ed5316c84d0e12ad18acfd40cefe15603ddfb (diff) | |
Cleanup: fix all sources that used EVP_MD_CTX_(create|init|destroy)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/srp')
| -rw-r--r-- | crypto/srp/srp_lib.c | 12 | ||||
| -rw-r--r-- | crypto/srp/srp_vfy.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c index 649d2b5a66..0a073b61e0 100644 --- a/crypto/srp/srp_lib.c +++ b/crypto/srp/srp_lib.c @@ -78,7 +78,7 @@ static BIGNUM *srp_Calc_k(BIGNUM *N, BIGNUM *g) if (BN_ucmp(g, N) >= 0) return NULL; - ctxt = EVP_MD_CTX_create(); + ctxt = EVP_MD_CTX_new(); if (ctxt == NULL) return NULL; if ((tmp = OPENSSL_malloc(longN)) == NULL) @@ -98,7 +98,7 @@ static BIGNUM *srp_Calc_k(BIGNUM *N, BIGNUM *g) EVP_DigestFinal_ex(ctxt, digest, NULL); res = BN_bin2bn(digest, sizeof(digest), NULL); err: - EVP_MD_CTX_destroy(ctxt); + EVP_MD_CTX_free(ctxt); return res; } @@ -119,7 +119,7 @@ BIGNUM *SRP_Calc_u(BIGNUM *A, BIGNUM *B, BIGNUM *N) longN = BN_num_bytes(N); - ctxt = EVP_MD_CTX_create(); + ctxt = EVP_MD_CTX_new(); if (ctxt == NULL) return NULL; if ((cAB = OPENSSL_malloc(2 * longN)) == NULL) @@ -140,7 +140,7 @@ BIGNUM *SRP_Calc_u(BIGNUM *A, BIGNUM *B, BIGNUM *N) u = NULL; } err: - EVP_MD_CTX_destroy(ctxt); + EVP_MD_CTX_free(ctxt); return u; } @@ -213,7 +213,7 @@ BIGNUM *SRP_Calc_x(BIGNUM *s, const char *user, const char *pass) if ((s == NULL) || (user == NULL) || (pass == NULL)) return NULL; - ctxt = EVP_MD_CTX_create(); + ctxt = EVP_MD_CTX_new(); if (ctxt == NULL) return NULL; if ((cs = OPENSSL_malloc(BN_num_bytes(s))) == NULL) @@ -234,7 +234,7 @@ BIGNUM *SRP_Calc_x(BIGNUM *s, const char *user, const char *pass) res = BN_bin2bn(dig, sizeof(dig), NULL); err: - EVP_MD_CTX_destroy(ctxt); + EVP_MD_CTX_free(ctxt); return res; } diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c index 24fe437e9b..1be68f2340 100644 --- a/crypto/srp/srp_vfy.c +++ b/crypto/srp/srp_vfy.c @@ -499,12 +499,12 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username) if (RAND_bytes(digv, SHA_DIGEST_LENGTH) <= 0) goto err; - ctxt = EVP_MD_CTX_create(); + ctxt = EVP_MD_CTX_new(); EVP_DigestInit_ex(ctxt, EVP_sha1(), NULL); EVP_DigestUpdate(ctxt, vb->seed_key, strlen(vb->seed_key)); EVP_DigestUpdate(ctxt, username, strlen(username)); EVP_DigestFinal_ex(ctxt, digs, NULL); - EVP_MD_CTX_destroy(ctxt); + EVP_MD_CTX_free(ctxt); ctxt = NULL; if (SRP_user_pwd_set_sv_BN(user, BN_bin2bn(digs, SHA_DIGEST_LENGTH, NULL), @@ -512,7 +512,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username) return user; err: - EVP_MD_CTX_destroy(ctxt); + EVP_MD_CTX_free(ctxt); SRP_user_pwd_free(user); return NULL; } |