diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
| commit | 4043d7db4e466d15193c3bad3b204048fc13b785 (patch) | |
| tree | 8156ce31a6e4a155fc240551f48c23b5a42a6e5e /openssl/trunk/crypto/asn1 | |
| parent | aba277548b76071e75fc9478002a6fc2145f64f1 (diff) | |
Merged in changes from OpenSSL 0.9.8d
svn path=/openssl/trunk/CHANGES; revision=377
Diffstat (limited to 'openssl/trunk/crypto/asn1')
| -rw-r--r-- | openssl/trunk/crypto/asn1/tasn_dec.c | 4 | ||||
| -rw-r--r-- | openssl/trunk/crypto/asn1/x_req.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/openssl/trunk/crypto/asn1/tasn_dec.c b/openssl/trunk/crypto/asn1/tasn_dec.c index f8b27cff..ff2f77b9 100644 --- a/openssl/trunk/crypto/asn1/tasn_dec.c +++ b/openssl/trunk/crypto/asn1/tasn_dec.c @@ -832,6 +832,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, } else if (ret == -1) return -1; + ret = 0; /* SEQUENCE, SET and "OTHER" are left in encoded form */ if ((utype == V_ASN1_SEQUENCE) || (utype == V_ASN1_SET) || (utype == V_ASN1_OTHER)) @@ -878,7 +879,10 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, * for UNIVERSAL class and ignore the tag. */ if (!asn1_collect(&buf, &p, plen, inf, -1, V_ASN1_UNIVERSAL)) + { + free_cont = 1; goto err; + } len = buf.length; /* Append a final null to string */ if (!BUF_MEM_grow_clean(&buf, len + 1)) diff --git a/openssl/trunk/crypto/asn1/x_req.c b/openssl/trunk/crypto/asn1/x_req.c index b3f18ebc..59ca8ce3 100644 --- a/openssl/trunk/crypto/asn1/x_req.c +++ b/openssl/trunk/crypto/asn1/x_req.c @@ -102,7 +102,7 @@ ASN1_SEQUENCE_enc(X509_REQ_INFO, enc, rinf_cb) = { IMPLEMENT_ASN1_FUNCTIONS(X509_REQ_INFO) -ASN1_SEQUENCE_ref(X509_REQ, 0, CRYPTO_LOCK_X509_INFO) = { +ASN1_SEQUENCE_ref(X509_REQ, 0, CRYPTO_LOCK_X509_REQ) = { ASN1_SIMPLE(X509_REQ, req_info, X509_REQ_INFO), ASN1_SIMPLE(X509_REQ, sig_alg, X509_ALGOR), ASN1_SIMPLE(X509_REQ, signature, ASN1_BIT_STRING) |