Style fixes and use the source parameter so the OCSP path works

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3149)
This commit is contained in:
Alex Gaynor 2017-04-08 09:21:19 -04:00 committed by Rich Salz
parent 8dcb87fdba
commit 2d8e9dbd2c

View File

@ -30,12 +30,12 @@ static int i2r_SCT_LIST(X509V3_EXT_METHOD *method, STACK_OF(SCT) *sct_list,
return 1;
}
static int set_sct_list_source(STACK_OF(SCT) *s, sct_source_t source) {
static int set_sct_list_source(STACK_OF(SCT) *s, sct_source_t source)
{
if (s != NULL) {
int i;
for (i = 0; i < sk_SCT_num(s); i++) {
int res = SCT_set_source(
sk_SCT_value(s, i), SCT_SOURCE_X509V3_EXTENSION);
int res = SCT_set_source(sk_SCT_value(s, i), source);
if (res != 1) {
return 0;
}
@ -46,7 +46,8 @@ static int set_sct_list_source(STACK_OF(SCT) *s, sct_source_t source) {
static STACK_OF(SCT) *x509_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
const unsigned char **pp,
long len) {
long len)
{
STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
if (set_sct_list_source(s, SCT_SOURCE_X509V3_EXTENSION) != 1) {
SCT_LIST_free(s);
@ -58,7 +59,8 @@ static STACK_OF(SCT) *x509_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
const unsigned char **pp,
long len) {
long len)
{
STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
if (set_sct_list_source(s, SCT_SOURCE_OCSP_STAPLED_RESPONSE) != 1) {
SCT_LIST_free(s);