Update to OpenSSL 1.0.2.o
This commit is contained in:
@@ -286,9 +286,9 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
|
||||
int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
|
||||
int crit, unsigned long flags)
|
||||
{
|
||||
int extidx = -1;
|
||||
int errcode;
|
||||
X509_EXTENSION *ext, *extmp;
|
||||
int errcode, extidx = -1;
|
||||
X509_EXTENSION *ext = NULL, *extmp;
|
||||
STACK_OF(X509_EXTENSION) *ret = NULL;
|
||||
unsigned long ext_op = flags & X509V3_ADD_OP_MASK;
|
||||
|
||||
/*
|
||||
@@ -347,13 +347,21 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!*x && !(*x = sk_X509_EXTENSION_new_null()))
|
||||
return -1;
|
||||
if (!sk_X509_EXTENSION_push(*x, ext))
|
||||
return -1;
|
||||
if ((ret = *x) == NULL
|
||||
&& (ret = sk_X509_EXTENSION_new_null()) == NULL)
|
||||
goto m_fail;
|
||||
if (!sk_X509_EXTENSION_push(ret, ext))
|
||||
goto m_fail;
|
||||
|
||||
*x = ret;
|
||||
return 1;
|
||||
|
||||
m_fail:
|
||||
if (ret != *x)
|
||||
sk_X509_EXTENSION_free(ret);
|
||||
X509_EXTENSION_free(ext);
|
||||
return -1;
|
||||
|
||||
err:
|
||||
if (!(flags & X509V3_ADD_SILENT))
|
||||
X509V3err(X509V3_F_X509V3_ADD1_I2D, errcode);
|
||||
|
||||
Reference in New Issue
Block a user