OpenSSL 1.1.1-pre2
This commit is contained in:
@@ -54,24 +54,24 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
|
||||
if (!X509_REQ_sign(ret, pkey, md))
|
||||
goto err;
|
||||
}
|
||||
return (ret);
|
||||
return ret;
|
||||
err:
|
||||
X509_REQ_free(ret);
|
||||
return (NULL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req)
|
||||
{
|
||||
if (req == NULL)
|
||||
return (NULL);
|
||||
return (X509_PUBKEY_get(req->req_info.pubkey));
|
||||
return NULL;
|
||||
return X509_PUBKEY_get(req->req_info.pubkey);
|
||||
}
|
||||
|
||||
EVP_PKEY *X509_REQ_get0_pubkey(X509_REQ *req)
|
||||
{
|
||||
if (req == NULL)
|
||||
return NULL;
|
||||
return (X509_PUBKEY_get0(req->req_info.pubkey));
|
||||
return X509_PUBKEY_get0(req->req_info.pubkey);
|
||||
}
|
||||
|
||||
X509_PUBKEY *X509_REQ_get_X509_PUBKEY(X509_REQ *req)
|
||||
@@ -115,7 +115,7 @@ int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
|
||||
}
|
||||
|
||||
EVP_PKEY_free(xk);
|
||||
return (ok);
|
||||
return ok;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -158,7 +158,7 @@ STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req)
|
||||
const unsigned char *p;
|
||||
|
||||
if ((req == NULL) || !ext_nids)
|
||||
return (NULL);
|
||||
return NULL;
|
||||
for (pnid = ext_nids; *pnid != NID_undef; pnid++) {
|
||||
idx = X509_REQ_get_attr_by_NID(req, *pnid, -1);
|
||||
if (idx == -1)
|
||||
|
||||
Reference in New Issue
Block a user