summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/evp/encode.c
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2014-10-07 05:35:11 +0000
committerSteve Langasek <steve.langasek@canonical.com>2014-10-07 05:35:11 +0000
commit1e963007c0d9466726a8680e52a95955288d8927 (patch)
tree9345749af183fe511dfe6a24fb43b44a5feefcd9 /Cryptlib/OpenSSL/crypto/evp/encode.c
parente34fca619d8a75f3b67d59d45cdd9db4da2342e6 (diff)
downloadefi-boot-shim-1e963007c0d9466726a8680e52a95955288d8927.tar.gz
efi-boot-shim-1e963007c0d9466726a8680e52a95955288d8927.zip
debian/patches/0001-Update-openssl-to-0.9.8za.patch: cherry-pick
openssl 0.9.8za in via upstream.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/evp/encode.c')
-rwxr-xr-xCryptlib/OpenSSL/crypto/evp/encode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Cryptlib/OpenSSL/crypto/evp/encode.c b/Cryptlib/OpenSSL/crypto/evp/encode.c
index e8a52181..69f7ccad 100755
--- a/Cryptlib/OpenSSL/crypto/evp/encode.c
+++ b/Cryptlib/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