diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-12 11:49:24 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-12 11:49:24 +0100 |
| commit | 0e7e4005460964cf8dac080e3d99e1df2a1bdc4d (patch) | |
| tree | 63fdba4f03bf47b0faa62b9d24cdff9a5a79a8b7 /ics-openvpn-stripped/main/openssl/crypto/pem/pvkfmt.c | |
| parent | 61dc26ab57ad4e2dba341998cabec3f411865e46 (diff) | |
Updated ics-openvpn to rev924.
Diffstat (limited to 'ics-openvpn-stripped/main/openssl/crypto/pem/pvkfmt.c')
| -rw-r--r-- | ics-openvpn-stripped/main/openssl/crypto/pem/pvkfmt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ics-openvpn-stripped/main/openssl/crypto/pem/pvkfmt.c b/ics-openvpn-stripped/main/openssl/crypto/pem/pvkfmt.c index b1bf71a5..ae89f828 100644 --- a/ics-openvpn-stripped/main/openssl/crypto/pem/pvkfmt.c +++ b/ics-openvpn-stripped/main/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)) |