diff options
| author | tedu <> | 2014-05-04 19:06:40 +0000 |
|---|---|---|
| committer | tedu <> | 2014-05-04 19:06:40 +0000 |
| commit | 854ed69879c6c89b7d91e5ed9c3c5124b719489e (patch) | |
| tree | 4b01513d4b7a7c1a63d1e8b37d91f3542e761604 /src/lib | |
| parent | b63f07b66256633f92e69899755ff4f3eabede40 (diff) | |
| download | openbsd-854ed69879c6c89b7d91e5ed9c3c5124b719489e.tar.gz openbsd-854ed69879c6c89b7d91e5ed9c3c5124b719489e.tar.bz2 openbsd-854ed69879c6c89b7d91e5ed9c3c5124b719489e.zip | |
i give up. reuse problem is unfixable. dlg says puppet crashes.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/asn1/tasn_dec.c | 12 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/asn1/tasn_dec.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c index d86bc4e091..c8b379f371 100644 --- a/src/lib/libcrypto/asn1/tasn_dec.c +++ b/src/lib/libcrypto/asn1/tasn_dec.c | |||
| @@ -382,14 +382,10 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, | |||
| 382 | goto err; | 382 | goto err; |
| 383 | } | 383 | } |
| 384 | 384 | ||
| 385 | if (!*pval) { | 385 | if (!*pval && !ASN1_item_ex_new(pval, it)) { |
| 386 | if (!ASN1_item_ex_new(pval, it)) { | 386 | ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, |
| 387 | ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, | 387 | ERR_R_NESTED_ASN1_ERROR); |
| 388 | ERR_R_NESTED_ASN1_ERROR); | 388 | goto err; |
| 389 | goto err; | ||
| 390 | } | ||
| 391 | } else { | ||
| 392 | memset(*pval, 0, it->size); | ||
| 393 | } | 389 | } |
| 394 | 390 | ||
| 395 | if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) | 391 | if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) |
diff --git a/src/lib/libssl/src/crypto/asn1/tasn_dec.c b/src/lib/libssl/src/crypto/asn1/tasn_dec.c index d86bc4e091..c8b379f371 100644 --- a/src/lib/libssl/src/crypto/asn1/tasn_dec.c +++ b/src/lib/libssl/src/crypto/asn1/tasn_dec.c | |||
| @@ -382,14 +382,10 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, | |||
| 382 | goto err; | 382 | goto err; |
| 383 | } | 383 | } |
| 384 | 384 | ||
| 385 | if (!*pval) { | 385 | if (!*pval && !ASN1_item_ex_new(pval, it)) { |
| 386 | if (!ASN1_item_ex_new(pval, it)) { | 386 | ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, |
| 387 | ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, | 387 | ERR_R_NESTED_ASN1_ERROR); |
| 388 | ERR_R_NESTED_ASN1_ERROR); | 388 | goto err; |
| 389 | goto err; | ||
| 390 | } | ||
| 391 | } else { | ||
| 392 | memset(*pval, 0, it->size); | ||
| 393 | } | 389 | } |
| 394 | 390 | ||
| 395 | if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) | 391 | if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) |