diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-12-03 16:11:54 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-12-03 16:15:19 -0800 |
| commit | 976a034585c7e8ff9dda5ebe032f399b78887f70 (patch) | |
| tree | 6b4e910551f98df066dd42bfcab4c0c2a46ee0fa /crypto/evp | |
| parent | c1fd76c1679ed77b14f41043a8bd30e94491bdef (diff) | |
| download | replicant_openssl-976a034585c7e8ff9dda5ebe032f399b78887f70.zip replicant_openssl-976a034585c7e8ff9dda5ebe032f399b78887f70.tar.gz replicant_openssl-976a034585c7e8ff9dda5ebe032f399b78887f70.tar.bz2 | |
Upgrade to openssl-1.0.0c
Bug: 3249410
Change-Id: Iac938a7d2f17b73dcb82b031607dae96dbb35f34
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/m_sigver.c | 4 | ||||
| -rw-r--r-- | crypto/evp/p_lib.c | 3 | ||||
| -rw-r--r-- | crypto/evp/p_sign.c | 2 | ||||
| -rw-r--r-- | crypto/evp/p_verify.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c index f0b7f95..7e2731f 100644 --- a/crypto/evp/m_sigver.c +++ b/crypto/evp/m_sigver.c @@ -137,7 +137,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen) sctx = 0; if (sigret) { - MS_STATIC EVP_MD_CTX tmp_ctx; + EVP_MD_CTX tmp_ctx; unsigned char md[EVP_MAX_MD_SIZE]; unsigned int mdlen; EVP_MD_CTX_init(&tmp_ctx); @@ -173,7 +173,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen) int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen) { - MS_STATIC EVP_MD_CTX tmp_ctx; + EVP_MD_CTX tmp_ctx; unsigned char md[EVP_MAX_MD_SIZE]; int r; unsigned int mdlen; diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 1916c61..e26ccd0 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -411,7 +411,10 @@ void EVP_PKEY_free(EVP_PKEY *x) static void EVP_PKEY_free_it(EVP_PKEY *x) { if (x->ameth && x->ameth->pkey_free) + { x->ameth->pkey_free(x); + x->pkey.ptr = NULL; + } #ifndef OPENSSL_NO_ENGINE if (x->engine) { diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c index 8df6d48..bb893f5 100644 --- a/crypto/evp/p_sign.c +++ b/crypto/evp/p_sign.c @@ -81,7 +81,7 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, unsigned char m[EVP_MAX_MD_SIZE]; unsigned int m_len; int i,ok=0,v; - MS_STATIC EVP_MD_CTX tmp_ctx; + EVP_MD_CTX tmp_ctx; *siglen=0; EVP_MD_CTX_init(&tmp_ctx); diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c index 8db4641..41d4b67 100644 --- a/crypto/evp/p_verify.c +++ b/crypto/evp/p_verify.c @@ -68,7 +68,7 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, unsigned char m[EVP_MAX_MD_SIZE]; unsigned int m_len; int i,ok=0,v; - MS_STATIC EVP_MD_CTX tmp_ctx; + EVP_MD_CTX tmp_ctx; EVP_MD_CTX_init(&tmp_ctx); EVP_MD_CTX_copy_ex(&tmp_ctx,ctx); |