diff options
| author | Gary Ching-Pang Lin <glin@suse.com> | 2014-08-19 12:15:00 +0800 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2014-08-19 14:20:23 -0400 |
| commit | 21f96e586351fc8b535353f2dea7c784e931d14a (patch) | |
| tree | c7028a2687dcc1ce83f2b3bfdf25d0a3f9af7aa1 /Cryptlib/OpenSSL/crypto/asn1/asn_pack.c | |
| parent | fa525bc4632e04346fae82a98ce23b31c6cfc86d (diff) | |
| download | efi-boot-shim-21f96e586351fc8b535353f2dea7c784e931d14a.tar.gz efi-boot-shim-21f96e586351fc8b535353f2dea7c784e931d14a.zip | |
Update openssl to 0.9.8zb
Also update to Tiano Cryptlib r15802 and remove the execute mode
bits from the C and header files of openssl
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/asn1/asn_pack.c')
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/asn1/asn_pack.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/asn1/asn_pack.c b/Cryptlib/OpenSSL/crypto/asn1/asn_pack.c index f1a5a056..c373714b 100755..100644 --- a/Cryptlib/OpenSSL/crypto/asn1/asn_pack.c +++ b/Cryptlib/OpenSSL/crypto/asn1/asn_pack.c @@ -134,15 +134,23 @@ ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d, ASN1_STRING **oct) if (!(octmp->length = i2d(obj, NULL))) { ASN1err(ASN1_F_ASN1_PACK_STRING,ASN1_R_ENCODE_ERROR); - return NULL; + goto err; } if (!(p = OPENSSL_malloc (octmp->length))) { ASN1err(ASN1_F_ASN1_PACK_STRING,ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } octmp->data = p; i2d (obj, &p); return octmp; + err: + if (!oct || !*oct) + { + ASN1_STRING_free(octmp); + if (oct) + *oct = NULL; + } + return NULL; } #endif |