From ab623c923d4e2c950342aec5da371cb92b1fbbc6 Mon Sep 17 00:00:00 2001 From: mrezai Date: Tue, 3 May 2016 23:59:14 +0430 Subject: Update OpenSSL to 1.0.2h --- drivers/builtin_openssl2/crypto/asn1/x_x509.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'drivers/builtin_openssl2/crypto/asn1/x_x509.c') diff --git a/drivers/builtin_openssl2/crypto/asn1/x_x509.c b/drivers/builtin_openssl2/crypto/asn1/x_x509.c index e2cac83694..e31e1e750d 100644 --- a/drivers/builtin_openssl2/crypto/asn1/x_x509.c +++ b/drivers/builtin_openssl2/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; } -- cgit v1.2.3