Commit 3a490bbb authored by Alex Gaynor's avatar Alex Gaynor Committed by Rich Salz
Browse files

Fixed #3020 -- set entry type on SCTs from X.509 and OCSP extensions 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3149)
parent e2580e70

crypto/ct/ct_x509v3.c

+39 −2
Original line number Diff line number Diff line
@@ -30,12 +30,49 @@ 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) {

    if (s != NULL) {

        for (size_t i = 0; i < sk_SCT_num(s); i++) {

            int res = SCT_set_source(

                sk_SCT_value(s, i), SCT_SOURCE_X509V3_EXTENSION);

            if (res != 1) {

                return 0;

            }

        }

    }

    return 1;

}



static STACK_OF(SCT) *x509_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,

                                            const unsigned char **pp,

                                            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);

         *a = NULL;

         return NULL;

     }

     return s;

}



static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,

                                            const unsigned char **pp,

                                            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);

        *a = NULL;

        return NULL;

    }

    return s;

}



/* Handlers for X509v3/OCSP Certificate Transparency extensions */

const X509V3_EXT_METHOD v3_ct_scts[3] = {

    /* X509v3 extension in certificates that contains SCTs */

    { NID_ct_precert_scts, 0, NULL,

    NULL, (X509V3_EXT_FREE)SCT_LIST_free,

    (X509V3_EXT_D2I)d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,

    (X509V3_EXT_D2I)x509_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,

    NULL, NULL,

    NULL, NULL,

    (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
@@ -52,7 +89,7 @@ const X509V3_EXT_METHOD v3_ct_scts[3] = { 
    /* OCSP extension that contains SCTs */

    { NID_ct_cert_scts, 0, NULL,

    0, (X509V3_EXT_FREE)SCT_LIST_free,

    (X509V3_EXT_D2I)d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,

    (X509V3_EXT_D2I)ocsp_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,

    NULL, NULL,

    NULL, NULL,

    (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,