diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-15 22:21:10 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-15 22:21:10 +0200 |
| commit | c35453897494d2b488961f7a446b4df8e24c6f31 (patch) | |
| tree | a454987f969b676b446a518ed51e70e9bc9e00ca /main/openssl/crypto/evp | |
| parent | 5d397e6220daa87129883a93353286cd6ffd18e8 (diff) | |
Update OpenSSL to 1.0.1h
Diffstat (limited to 'main/openssl/crypto/evp')
| -rw-r--r-- | main/openssl/crypto/evp/bio_b64.c | 1 | ||||
| -rw-r--r-- | main/openssl/crypto/evp/encode.c | 1 | ||||
| -rw-r--r-- | main/openssl/crypto/evp/p_lib.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/main/openssl/crypto/evp/bio_b64.c b/main/openssl/crypto/evp/bio_b64.c index ac6d441a..16863fe2 100644 --- a/main/openssl/crypto/evp/bio_b64.c +++ b/main/openssl/crypto/evp/bio_b64.c @@ -226,6 +226,7 @@ static int b64_read(BIO *b, char *out, int outl) else if (ctx->start) { q=p=(unsigned char *)ctx->tmp; + num = 0; for (j=0; j<i; j++) { if (*(q++) != '\n') continue; diff --git a/main/openssl/crypto/evp/encode.c b/main/openssl/crypto/evp/encode.c index 28546a84..4654bdc6 100644 --- a/main/openssl/crypto/evp/encode.c +++ b/main/openssl/crypto/evp/encode.c @@ -324,6 +324,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl, v=EVP_DecodeBlock(out,d,n); n=0; if (v < 0) { rv=0; goto end; } + if (eof > v) { rv=-1; goto end; } ret+=(v-eof); } else diff --git a/main/openssl/crypto/evp/p_lib.c b/main/openssl/crypto/evp/p_lib.c index bd1977d7..8ee53c1d 100644 --- a/main/openssl/crypto/evp/p_lib.c +++ b/main/openssl/crypto/evp/p_lib.c @@ -202,7 +202,7 @@ EVP_PKEY *EVP_PKEY_new(void) EVP_PKEY *EVP_PKEY_dup(EVP_PKEY *pkey) { - CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); + CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); return pkey; } |