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/encode.c | |
parent | 5d397e6220daa87129883a93353286cd6ffd18e8 (diff) |
Update OpenSSL to 1.0.1h
Diffstat (limited to 'main/openssl/crypto/evp/encode.c')
-rw-r--r-- | main/openssl/crypto/evp/encode.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 |