generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Parse non-v1 SCTs less awkwardly.

Browse Source 
(cherry picked from commit 19f65ddbab30543415584ae7916e12a3c5249dba)
This commit is contained in:
Rob Stradling 2014-02-25 10:14:51 +00:00 committed by Dr. Stephen Henson
parent c3006e0f5a
commit a948732e1c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/x509v3/v3_scts.c
View File

@ -141,9 +141,12 @@ static int i2r_scts(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *oct,
BIO_printf(out, "%*sSigned Certificate Timestamp:", indent, BIO_printf(out, "%*sSigned Certificate Timestamp:", indent,
""); "");
BIO_printf(out, "\n%*sVersion : ", indent + 4, "");
if (*data == 0) /* SCT v1 */ if (*data == 0) /* SCT v1 */
{ {
BIO_printf(out, "v1(0)");
/* Fixed-length header: /* Fixed-length header:
* struct { * struct {
* (1 byte) Version sct_version; * (1 byte) Version sct_version;
@ -155,9 +158,6 @@ static int i2r_scts(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *oct,
return 0; return 0;
sctlen -= 43; sctlen -= 43;
BIO_printf(out, "\n%*sVersion : v1(0)", indent + 4,
"");
BIO_printf(out, "\n%*sLog ID : ", indent + 4, ""); BIO_printf(out, "\n%*sLog ID : ", indent + 4, "");
BIO_hex_string(out, indent + 16, 16, data + 1, 32); BIO_hex_string(out, indent + 16, 16, data + 1, 32);
@ -195,9 +195,16 @@ static int i2r_scts(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *oct,
return 0; return 0;
BIO_printf(out, "\n%*s ", indent + 4, ""); BIO_printf(out, "\n%*s ", indent + 4, "");
BIO_hex_string(out, indent + 16, 16, data, fieldlen); BIO_hex_string(out, indent + 16, 16, data, fieldlen);
if (listlen > 0) BIO_printf(out, "\n");
data += fieldlen; data += fieldlen;
} }
else /* Unknown version */
{
BIO_printf(out, "unknown\n%*s", indent + 16, "");
BIO_hex_string(out, indent + 16, 16, data, sctlen);
data += sctlen;
}
if (listlen > 0) BIO_printf(out, "\n");
} }
return 1; return 1;