diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 05:35:11 +0000 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 05:35:11 +0000 |
| commit | 1e963007c0d9466726a8680e52a95955288d8927 (patch) | |
| tree | 9345749af183fe511dfe6a24fb43b44a5feefcd9 /Cryptlib/OpenSSL/crypto/evp | |
| parent | e34fca619d8a75f3b67d59d45cdd9db4da2342e6 (diff) | |
| download | efi-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')
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/evp/bio_b64.c | 3 | ||||
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/evp/encode.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Cryptlib/OpenSSL/crypto/evp/bio_b64.c b/Cryptlib/OpenSSL/crypto/evp/bio_b64.c index 72a2a672..16863fe2 100755 --- a/Cryptlib/OpenSSL/crypto/evp/bio_b64.c +++ b/Cryptlib/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; @@ -264,7 +265,7 @@ static int b64_read(BIO *b, char *out, int outl) } /* we fell off the end without starting */ - if (j == i) + if ((j == i) && (num == 0)) { /* Is this is one long chunk?, if so, keep on * reading until a new line. */ 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 |