1 files changed, 129 insertions, 9 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c
index a9ac7197b6..62f40aaff9 100644
--- a/src/lib/libcrypto/x509v3/v3_ia5.c
+++ b/src/lib/libcrypto/x509v3/v3_ia5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_ia5.c,v 1.13 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: v3_ia5.c,v 1.14 2015/07/29 16:13:48 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
 * project 1999.
 */
@@ -69,14 +69,134 @@ static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
    X509V3_CTX *ctx, char *str);
 const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
-        EXT_IA5STRING(NID_netscape_base_url),
+        {
-        EXT_IA5STRING(NID_netscape_revocation_url),
+                .ext_nid = NID_netscape_base_url,
-        EXT_IA5STRING(NID_netscape_ca_revocation_url),
+                .ext_flags = 0,
-        EXT_IA5STRING(NID_netscape_renewal_url),
+                .it = ASN1_ITEM_ref(ASN1_IA5STRING),
-        EXT_IA5STRING(NID_netscape_ca_policy_url),
+                .ext_new = NULL,
-        EXT_IA5STRING(NID_netscape_ssl_server_name),
+                .ext_free = NULL,
-        EXT_IA5STRING(NID_netscape_comment),
+                .d2i = NULL,
-        EXT_END
+                .i2d = NULL,
+                .i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
+                .s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
+                .i2v = NULL,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
+        },
+        {
+                .ext_nid = NID_netscape_revocation_url,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(ASN1_IA5STRING),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
+                .s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
+                .i2v = NULL,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
+        },
+        {
+                .ext_nid = NID_netscape_ca_revocation_url,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(ASN1_IA5STRING),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
+                .s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
+                .i2v = NULL,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
+        },
+        {
+                .ext_nid = NID_netscape_renewal_url,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(ASN1_IA5STRING),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
+                .s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
+                .i2v = NULL,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
+        },
+        {
+                .ext_nid = NID_netscape_ca_policy_url,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(ASN1_IA5STRING),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
+                .s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
+                .i2v = NULL,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
+        },
+        {
+                .ext_nid = NID_netscape_ssl_server_name,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(ASN1_IA5STRING),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
+                .s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
+                .i2v = NULL,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
+        },
+        {
+                .ext_nid = NID_netscape_comment,
+                .ext_flags = 0,
+                .it = ASN1_ITEM_ref(ASN1_IA5STRING),
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
+                .s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
+                .i2v = NULL,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
+        },
+        {
+                .ext_nid = -1,
+                .ext_flags = 0,
+                .it = NULL,
+                .ext_new = NULL,
+                .ext_free = NULL,
+                .d2i = NULL,
+                .i2d = NULL,
+                .i2s = NULL,
+                .s2i = NULL,
+                .i2v = NULL,
+                .v2i = NULL,
+                .i2r = NULL,
+                .r2i = NULL,
+                .usr_data = NULL,
+        },
 };
 static char *

diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c index a9ac7197b6..62f40aaff9 100644 --- a/src/lib/libcrypto/x509v3/v3_ia5.c +++ b/src/lib/libcrypto/x509v3/v3_ia5.c
@@ -1,4 +1,4 @@
1	/* $OpenBSD: v3_ia5.c,v 1.13 2014/07/11 08:44:49 jsing Exp $ */	1	/* $OpenBSD: v3_ia5.c,v 1.14 2015/07/29 16:13:48 jsing Exp $ */
2	/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL	2	/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3	* project 1999.	3	* project 1999.
4	*/	4	*/
@@ -69,14 +69,134 @@ static ASN1_IA5STRING s2i_ASN1_IA5STRING(X509V3_EXT_METHOD method,
69	X509V3_CTX ctx, char str);	69	X509V3_CTX ctx, char str);
70		70
71	const X509V3_EXT_METHOD v3_ns_ia5_list[] = {	71	const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
72	EXT_IA5STRING(NID_netscape_base_url),	72	{
73	EXT_IA5STRING(NID_netscape_revocation_url),	73	.ext_nid = NID_netscape_base_url,
74	EXT_IA5STRING(NID_netscape_ca_revocation_url),	74	.ext_flags = 0,
75	EXT_IA5STRING(NID_netscape_renewal_url),	75	.it = ASN1_ITEM_ref(ASN1_IA5STRING),
76	EXT_IA5STRING(NID_netscape_ca_policy_url),	76	.ext_new = NULL,
77	EXT_IA5STRING(NID_netscape_ssl_server_name),	77	.ext_free = NULL,
78	EXT_IA5STRING(NID_netscape_comment),	78	.d2i = NULL,
79	EXT_END	79	.i2d = NULL,
		80	.i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
		81	.s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
		82	.i2v = NULL,
		83	.v2i = NULL,
		84	.i2r = NULL,
		85	.r2i = NULL,
		86	.usr_data = NULL,
		87	},
		88	{
		89	.ext_nid = NID_netscape_revocation_url,
		90	.ext_flags = 0,
		91	.it = ASN1_ITEM_ref(ASN1_IA5STRING),
		92	.ext_new = NULL,
		93	.ext_free = NULL,
		94	.d2i = NULL,
		95	.i2d = NULL,
		96	.i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
		97	.s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
		98	.i2v = NULL,
		99	.v2i = NULL,
		100	.i2r = NULL,
		101	.r2i = NULL,
		102	.usr_data = NULL,
		103	},
		104	{
		105	.ext_nid = NID_netscape_ca_revocation_url,
		106	.ext_flags = 0,
		107	.it = ASN1_ITEM_ref(ASN1_IA5STRING),
		108	.ext_new = NULL,
		109	.ext_free = NULL,
		110	.d2i = NULL,
		111	.i2d = NULL,
		112	.i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
		113	.s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
		114	.i2v = NULL,
		115	.v2i = NULL,
		116	.i2r = NULL,
		117	.r2i = NULL,
		118	.usr_data = NULL,
		119	},
		120	{
		121	.ext_nid = NID_netscape_renewal_url,
		122	.ext_flags = 0,
		123	.it = ASN1_ITEM_ref(ASN1_IA5STRING),
		124	.ext_new = NULL,
		125	.ext_free = NULL,
		126	.d2i = NULL,
		127	.i2d = NULL,
		128	.i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
		129	.s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
		130	.i2v = NULL,
		131	.v2i = NULL,
		132	.i2r = NULL,
		133	.r2i = NULL,
		134	.usr_data = NULL,
		135	},
		136	{
		137	.ext_nid = NID_netscape_ca_policy_url,
		138	.ext_flags = 0,
		139	.it = ASN1_ITEM_ref(ASN1_IA5STRING),
		140	.ext_new = NULL,
		141	.ext_free = NULL,
		142	.d2i = NULL,
		143	.i2d = NULL,
		144	.i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
		145	.s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
		146	.i2v = NULL,
		147	.v2i = NULL,
		148	.i2r = NULL,
		149	.r2i = NULL,
		150	.usr_data = NULL,
		151	},
		152	{
		153	.ext_nid = NID_netscape_ssl_server_name,
		154	.ext_flags = 0,
		155	.it = ASN1_ITEM_ref(ASN1_IA5STRING),
		156	.ext_new = NULL,
		157	.ext_free = NULL,
		158	.d2i = NULL,
		159	.i2d = NULL,
		160	.i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
		161	.s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
		162	.i2v = NULL,
		163	.v2i = NULL,
		164	.i2r = NULL,
		165	.r2i = NULL,
		166	.usr_data = NULL,
		167	},
		168	{
		169	.ext_nid = NID_netscape_comment,
		170	.ext_flags = 0,
		171	.it = ASN1_ITEM_ref(ASN1_IA5STRING),
		172	.ext_new = NULL,
		173	.ext_free = NULL,
		174	.d2i = NULL,
		175	.i2d = NULL,
		176	.i2s = (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,
		177	.s2i = (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,
		178	.i2v = NULL,
		179	.v2i = NULL,
		180	.i2r = NULL,
		181	.r2i = NULL,
		182	.usr_data = NULL,
		183	},
		184	{
		185	.ext_nid = -1,
		186	.ext_flags = 0,
		187	.it = NULL,
		188	.ext_new = NULL,
		189	.ext_free = NULL,
		190	.d2i = NULL,
		191	.i2d = NULL,
		192	.i2s = NULL,
		193	.s2i = NULL,
		194	.i2v = NULL,
		195	.v2i = NULL,
		196	.i2r = NULL,
		197	.r2i = NULL,
		198	.usr_data = NULL,
		199	},
80	};	200	};
81		201
82	static char *	202	static char *