diff options
author | pvalchev <> | 2006-10-04 07:10:32 +0000 |
---|---|---|
committer | pvalchev <> | 2006-10-04 07:10:32 +0000 |
commit | 2ae4a931445dd6121f260bcc0af2dde32a871cd0 (patch) | |
tree | 79c58b0010b91a2778efdc406095e24c85a41ae1 /src/lib/libcrypto/asn1/tasn_dec.c | |
parent | c2d940ce6f2c3ef66262b7c1953e6286cf68b267 (diff) | |
download | openbsd-2ae4a931445dd6121f260bcc0af2dde32a871cd0.tar.gz openbsd-2ae4a931445dd6121f260bcc0af2dde32a871cd0.tar.bz2 openbsd-2ae4a931445dd6121f260bcc0af2dde32a871cd0.zip |
openssl security fixes, diff from markus@, ok & "commit it" djm@
http://www.openssl.org/news/secadv_20060928.txt for more
Diffstat (limited to 'src/lib/libcrypto/asn1/tasn_dec.c')
-rw-r--r-- | src/lib/libcrypto/asn1/tasn_dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c index c22501fc63..b7e916ef36 100644 --- a/src/lib/libcrypto/asn1/tasn_dec.c +++ b/src/lib/libcrypto/asn1/tasn_dec.c | |||
@@ -629,6 +629,8 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, unsigned char **in, long inl | |||
629 | ASN1err(ASN1_F_ASN1_D2I_EX_PRIMITIVE, ERR_R_NESTED_ASN1_ERROR); | 629 | ASN1err(ASN1_F_ASN1_D2I_EX_PRIMITIVE, ERR_R_NESTED_ASN1_ERROR); |
630 | return 0; | 630 | return 0; |
631 | } else if(ret == -1) return -1; | 631 | } else if(ret == -1) return -1; |
632 | |||
633 | ret = 0; | ||
632 | /* SEQUENCE, SET and "OTHER" are left in encoded form */ | 634 | /* SEQUENCE, SET and "OTHER" are left in encoded form */ |
633 | if((utype == V_ASN1_SEQUENCE) || (utype == V_ASN1_SET) || (utype == V_ASN1_OTHER)) { | 635 | if((utype == V_ASN1_SEQUENCE) || (utype == V_ASN1_SET) || (utype == V_ASN1_OTHER)) { |
634 | /* Clear context cache for type OTHER because the auto clear when | 636 | /* Clear context cache for type OTHER because the auto clear when |