diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2016-05-03 18:00:27 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2016-05-03 18:00:27 +0000 |
| commit | 57f1256b1a087adbdf8e5c080dd9ed7975de939a (patch) | |
| tree | 2dd85c58056a364765d9ae59d6a1774d41f88523 /crypto/asn1/x_x509.c | |
| parent | 9aeed18ad799c20d3accf6e1535817538dc983f6 (diff) | |
| download | src-57f1256b1a087adbdf8e5c080dd9ed7975de939a.tar.gz src-57f1256b1a087adbdf8e5c080dd9ed7975de939a.zip | |
Import OpenSSL 1.0.2h.vendor/openssl/1.0.2h
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=298991
svn path=/vendor-crypto/openssl/1.0.2h/; revision=298992; tag=vendor/openssl/1.0.2h
Diffstat (limited to 'crypto/asn1/x_x509.c')
| -rw-r--r-- | crypto/asn1/x_x509.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index e2cac836943d..e31e1e750d9d 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -201,10 +201,20 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) int i2d_X509_AUX(X509 *a, unsigned char **pp) { - int length; + int length, tmplen; + unsigned char *start = pp != NULL ? *pp : NULL; length = i2d_X509(a, pp); - if (a) - length += i2d_X509_CERT_AUX(a->aux, pp); + if (length < 0 || a == NULL) + return length; + + tmplen = i2d_X509_CERT_AUX(a->aux, pp); + if (tmplen < 0) { + if (start != NULL) + *pp = start; + return tmplen; + } + length += tmplen; + return length; } |