summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/tasn_dec.c
diff options
context:
space:
mode:
authortedu <>2016-05-03 12:38:53 +0000
committertedu <>2016-05-03 12:38:53 +0000
commitc6409771d22d6e819d9017d650687b93c835ed3a (patch)
treeb82aa12b453d40dd8f8ba316bad714a4590f3c18 /src/lib/libcrypto/asn1/tasn_dec.c
parent5be055d50dafafb44d2ef72c845fd6bdf3785179 (diff)
downloadopenbsd-c6409771d22d6e819d9017d650687b93c835ed3a.tar.gz
openbsd-c6409771d22d6e819d9017d650687b93c835ed3a.tar.bz2
openbsd-c6409771d22d6e819d9017d650687b93c835ed3a.zip
patch from openssl for multiple issues:
missing padding check in aesni functions overflow in evp encode functions use of invalid negative asn.1 types ok beck
Diffstat (limited to 'src/lib/libcrypto/asn1/tasn_dec.c')
-rw-r--r--src/lib/libcrypto/asn1/tasn_dec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index 23a6740115..55809babb8 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_dec.c,v 1.29 2015/12/12 21:05:11 beck Exp $ */ 1/* $OpenBSD: tasn_dec.c,v 1.30 2016/05/03 12:38:53 tedu Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -861,9 +861,7 @@ asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype,
861 break; 861 break;
862 862
863 case V_ASN1_INTEGER: 863 case V_ASN1_INTEGER:
864 case V_ASN1_NEG_INTEGER:
865 case V_ASN1_ENUMERATED: 864 case V_ASN1_ENUMERATED:
866 case V_ASN1_NEG_ENUMERATED:
867 tint = (ASN1_INTEGER **)pval; 865 tint = (ASN1_INTEGER **)pval;
868 if (!c2i_ASN1_INTEGER(tint, &cont, len)) 866 if (!c2i_ASN1_INTEGER(tint, &cont, len))
869 goto err; 867 goto err;