diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
| commit | 5f6cb652dbd2ef0879673cf7338520dc2be236b9 (patch) | |
| tree | bc47c8ccbcd48bfc5aee6b404c8ef3f1d9a359cb /app/openssl/crypto/pem | |
| parent | 576b0c26baf9b5b1418650a572604325ca7fb3af (diff) | |
| parent | f347c871d0433ef3efb85beb5e386b58d700faad (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/openssl/crypto/pem')
| -rw-r--r-- | app/openssl/crypto/pem/pvkfmt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/openssl/crypto/pem/pvkfmt.c b/app/openssl/crypto/pem/pvkfmt.c index b1bf71a5..ae89f828 100644 --- a/app/openssl/crypto/pem/pvkfmt.c +++ b/app/openssl/crypto/pem/pvkfmt.c @@ -759,6 +759,11 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, /* Copy BLOBHEADER across, decrypt rest */ memcpy(enctmp, p, 8); p += 8; + if (keylen < 8) + { + PEMerr(PEM_F_DO_PVK_BODY, PEM_R_PVK_TOO_SHORT); + return NULL; + } inlen = keylen - 8; q = enctmp + 8; if (!EVP_DecryptInit_ex(&cctx, EVP_rc4(), NULL, keybuf, NULL)) |