summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509/x509_utl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/x509/x509_utl.c')
-rw-r--r--src/lib/libcrypto/x509/x509_utl.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/lib/libcrypto/x509/x509_utl.c b/src/lib/libcrypto/x509/x509_utl.c
index aa18efe2c5..ec67ae093c 100644
--- a/src/lib/libcrypto/x509/x509_utl.c
+++ b/src/lib/libcrypto/x509/x509_utl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_utl.c,v 1.5 2022/12/26 07:18:53 jmc Exp $ */ 1/* $OpenBSD: x509_utl.c,v 1.6 2023/02/16 08:38:17 tb 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. 3 * project.
4 */ 4 */
@@ -117,7 +117,7 @@ X509V3_add_value(const char *name, const char *value,
117 } 117 }
118 return 0; 118 return 0;
119} 119}
120LCRYPTO_ALIAS(X509V3_add_value) 120LCRYPTO_ALIAS(X509V3_add_value);
121 121
122int 122int
123X509V3_add_value_uchar(const char *name, const unsigned char *value, 123X509V3_add_value_uchar(const char *name, const unsigned char *value,
@@ -125,7 +125,7 @@ X509V3_add_value_uchar(const char *name, const unsigned char *value,
125{ 125{
126 return X509V3_add_value(name, (const char *)value, extlist); 126 return X509V3_add_value(name, (const char *)value, extlist);
127} 127}
128LCRYPTO_ALIAS(X509V3_add_value_uchar) 128LCRYPTO_ALIAS(X509V3_add_value_uchar);
129 129
130/* Free function for STACK_OF(CONF_VALUE) */ 130/* Free function for STACK_OF(CONF_VALUE) */
131 131
@@ -139,7 +139,7 @@ X509V3_conf_free(CONF_VALUE *conf)
139 free(conf->section); 139 free(conf->section);
140 free(conf); 140 free(conf);
141} 141}
142LCRYPTO_ALIAS(X509V3_conf_free) 142LCRYPTO_ALIAS(X509V3_conf_free);
143 143
144int 144int
145X509V3_add_value_bool(const char *name, int asn1_bool, 145X509V3_add_value_bool(const char *name, int asn1_bool,
@@ -149,7 +149,7 @@ X509V3_add_value_bool(const char *name, int asn1_bool,
149 return X509V3_add_value(name, "TRUE", extlist); 149 return X509V3_add_value(name, "TRUE", extlist);
150 return X509V3_add_value(name, "FALSE", extlist); 150 return X509V3_add_value(name, "FALSE", extlist);
151} 151}
152LCRYPTO_ALIAS(X509V3_add_value_bool) 152LCRYPTO_ALIAS(X509V3_add_value_bool);
153 153
154int 154int
155X509V3_add_value_bool_nf(const char *name, int asn1_bool, 155X509V3_add_value_bool_nf(const char *name, int asn1_bool,
@@ -159,7 +159,7 @@ X509V3_add_value_bool_nf(const char *name, int asn1_bool,
159 return X509V3_add_value(name, "TRUE", extlist); 159 return X509V3_add_value(name, "TRUE", extlist);
160 return 1; 160 return 1;
161} 161}
162LCRYPTO_ALIAS(X509V3_add_value_bool_nf) 162LCRYPTO_ALIAS(X509V3_add_value_bool_nf);
163 163
164char * 164char *
165bn_to_string(const BIGNUM *bn) 165bn_to_string(const BIGNUM *bn)
@@ -202,7 +202,7 @@ i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *method, const ASN1_ENUMERATED *a)
202 BN_free(bntmp); 202 BN_free(bntmp);
203 return strtmp; 203 return strtmp;
204} 204}
205LCRYPTO_ALIAS(i2s_ASN1_ENUMERATED) 205LCRYPTO_ALIAS(i2s_ASN1_ENUMERATED);
206 206
207char * 207char *
208i2s_ASN1_INTEGER(X509V3_EXT_METHOD *method, const ASN1_INTEGER *a) 208i2s_ASN1_INTEGER(X509V3_EXT_METHOD *method, const ASN1_INTEGER *a)
@@ -218,7 +218,7 @@ i2s_ASN1_INTEGER(X509V3_EXT_METHOD *method, const ASN1_INTEGER *a)
218 BN_free(bntmp); 218 BN_free(bntmp);
219 return strtmp; 219 return strtmp;
220} 220}
221LCRYPTO_ALIAS(i2s_ASN1_INTEGER) 221LCRYPTO_ALIAS(i2s_ASN1_INTEGER);
222 222
223ASN1_INTEGER * 223ASN1_INTEGER *
224s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, const char *value) 224s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, const char *value)
@@ -269,7 +269,7 @@ s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, const char *value)
269 aint->type |= V_ASN1_NEG; 269 aint->type |= V_ASN1_NEG;
270 return aint; 270 return aint;
271} 271}
272LCRYPTO_ALIAS(s2i_ASN1_INTEGER) 272LCRYPTO_ALIAS(s2i_ASN1_INTEGER);
273 273
274int 274int
275X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint, 275X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
@@ -286,7 +286,7 @@ X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
286 free(strtmp); 286 free(strtmp);
287 return ret; 287 return ret;
288} 288}
289LCRYPTO_ALIAS(X509V3_add_value_int) 289LCRYPTO_ALIAS(X509V3_add_value_int);
290 290
291int 291int
292X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool) 292X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool)
@@ -312,7 +312,7 @@ X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool)
312 X509V3_conf_err(value); 312 X509V3_conf_err(value);
313 return 0; 313 return 0;
314} 314}
315LCRYPTO_ALIAS(X509V3_get_value_bool) 315LCRYPTO_ALIAS(X509V3_get_value_bool);
316 316
317int 317int
318X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint) 318X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint)
@@ -326,7 +326,7 @@ X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint)
326 *aint = itmp; 326 *aint = itmp;
327 return 1; 327 return 1;
328} 328}
329LCRYPTO_ALIAS(X509V3_get_value_int) 329LCRYPTO_ALIAS(X509V3_get_value_int);
330 330
331#define HDR_NAME 1 331#define HDR_NAME 1
332#define HDR_VALUE 2 332#define HDR_VALUE 2
@@ -418,7 +418,7 @@ X509V3_parse_list(const char *line)
418 return NULL; 418 return NULL;
419 419
420} 420}
421LCRYPTO_ALIAS(X509V3_parse_list) 421LCRYPTO_ALIAS(X509V3_parse_list);
422 422
423/* Delete leading and trailing spaces from a string */ 423/* Delete leading and trailing spaces from a string */
424static char * 424static char *
@@ -470,7 +470,7 @@ hex_to_string(const unsigned char *buffer, long len)
470 q[-1] = 0; 470 q[-1] = 0;
471 return tmp; 471 return tmp;
472} 472}
473LCRYPTO_ALIAS(hex_to_string) 473LCRYPTO_ALIAS(hex_to_string);
474 474
475/* Give a string of hex digits convert to 475/* Give a string of hex digits convert to
476 * a buffer 476 * a buffer
@@ -532,7 +532,7 @@ string_to_hex(const char *str, long *len)
532 X509V3error(X509V3_R_ILLEGAL_HEX_DIGIT); 532 X509V3error(X509V3_R_ILLEGAL_HEX_DIGIT);
533 return NULL; 533 return NULL;
534} 534}
535LCRYPTO_ALIAS(string_to_hex) 535LCRYPTO_ALIAS(string_to_hex);
536 536
537/* V2I name comparison function: returns zero if 'name' matches 537/* V2I name comparison function: returns zero if 'name' matches
538 * cmp or cmp.* 538 * cmp or cmp.*
@@ -570,7 +570,7 @@ X509_get1_email(X509 *x)
570 sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); 570 sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
571 return ret; 571 return ret;
572} 572}
573LCRYPTO_ALIAS(X509_get1_email) 573LCRYPTO_ALIAS(X509_get1_email);
574 574
575STACK_OF(OPENSSL_STRING) * 575STACK_OF(OPENSSL_STRING) *
576X509_get1_ocsp(X509 *x) 576X509_get1_ocsp(X509 *x)
@@ -595,7 +595,7 @@ X509_get1_ocsp(X509 *x)
595 AUTHORITY_INFO_ACCESS_free(info); 595 AUTHORITY_INFO_ACCESS_free(info);
596 return ret; 596 return ret;
597} 597}
598LCRYPTO_ALIAS(X509_get1_ocsp) 598LCRYPTO_ALIAS(X509_get1_ocsp);
599 599
600STACK_OF(OPENSSL_STRING) * 600STACK_OF(OPENSSL_STRING) *
601X509_REQ_get1_email(X509_REQ *x) 601X509_REQ_get1_email(X509_REQ *x)
@@ -611,7 +611,7 @@ X509_REQ_get1_email(X509_REQ *x)
611 sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free); 611 sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
612 return ret; 612 return ret;
613} 613}
614LCRYPTO_ALIAS(X509_REQ_get1_email) 614LCRYPTO_ALIAS(X509_REQ_get1_email);
615 615
616 616
617static STACK_OF(OPENSSL_STRING) * 617static STACK_OF(OPENSSL_STRING) *
@@ -681,7 +681,7 @@ X509_email_free(STACK_OF(OPENSSL_STRING) *sk)
681{ 681{
682 sk_OPENSSL_STRING_pop_free(sk, str_free); 682 sk_OPENSSL_STRING_pop_free(sk, str_free);
683} 683}
684LCRYPTO_ALIAS(X509_email_free) 684LCRYPTO_ALIAS(X509_email_free);
685 685
686typedef int (*equal_fn)(const unsigned char *pattern, size_t pattern_len, 686typedef int (*equal_fn)(const unsigned char *pattern, size_t pattern_len,
687 const unsigned char *subject, size_t subject_len, unsigned int flags); 687 const unsigned char *subject, size_t subject_len, unsigned int flags);
@@ -1083,7 +1083,7 @@ X509_check_host(X509 *x, const char *chk, size_t chklen, unsigned int flags,
1083 return -2; 1083 return -2;
1084 return do_x509_check(x, chk, chklen, flags, GEN_DNS, peername); 1084 return do_x509_check(x, chk, chklen, flags, GEN_DNS, peername);
1085} 1085}
1086LCRYPTO_ALIAS(X509_check_host) 1086LCRYPTO_ALIAS(X509_check_host);
1087 1087
1088int 1088int
1089X509_check_email(X509 *x, const char *chk, size_t chklen, unsigned int flags) 1089X509_check_email(X509 *x, const char *chk, size_t chklen, unsigned int flags)
@@ -1096,7 +1096,7 @@ X509_check_email(X509 *x, const char *chk, size_t chklen, unsigned int flags)
1096 return -2; 1096 return -2;
1097 return do_x509_check(x, chk, chklen, flags, GEN_EMAIL, NULL); 1097 return do_x509_check(x, chk, chklen, flags, GEN_EMAIL, NULL);
1098} 1098}
1099LCRYPTO_ALIAS(X509_check_email) 1099LCRYPTO_ALIAS(X509_check_email);
1100 1100
1101int 1101int
1102X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen, 1102X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
@@ -1106,7 +1106,7 @@ X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
1106 return -2; 1106 return -2;
1107 return do_x509_check(x, (char *)chk, chklen, flags, GEN_IPADD, NULL); 1107 return do_x509_check(x, (char *)chk, chklen, flags, GEN_IPADD, NULL);
1108} 1108}
1109LCRYPTO_ALIAS(X509_check_ip) 1109LCRYPTO_ALIAS(X509_check_ip);
1110 1110
1111int 1111int
1112X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags) 1112X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags)
@@ -1121,7 +1121,7 @@ X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags)
1121 return -2; 1121 return -2;
1122 return do_x509_check(x, (char *)ipout, iplen, flags, GEN_IPADD, NULL); 1122 return do_x509_check(x, (char *)ipout, iplen, flags, GEN_IPADD, NULL);
1123} 1123}
1124LCRYPTO_ALIAS(X509_check_ip_asc) 1124LCRYPTO_ALIAS(X509_check_ip_asc);
1125 1125
1126/* Convert IP addresses both IPv4 and IPv6 into an 1126/* Convert IP addresses both IPv4 and IPv6 into an
1127 * OCTET STRING compatible with RFC3280. 1127 * OCTET STRING compatible with RFC3280.
@@ -1150,7 +1150,7 @@ a2i_IPADDRESS(const char *ipasc)
1150 } 1150 }
1151 return ret; 1151 return ret;
1152} 1152}
1153LCRYPTO_ALIAS(a2i_IPADDRESS) 1153LCRYPTO_ALIAS(a2i_IPADDRESS);
1154 1154
1155ASN1_OCTET_STRING * 1155ASN1_OCTET_STRING *
1156a2i_IPADDRESS_NC(const char *ipasc) 1156a2i_IPADDRESS_NC(const char *ipasc)
@@ -1196,7 +1196,7 @@ a2i_IPADDRESS_NC(const char *ipasc)
1196 ASN1_OCTET_STRING_free(ret); 1196 ASN1_OCTET_STRING_free(ret);
1197 return NULL; 1197 return NULL;
1198} 1198}
1199LCRYPTO_ALIAS(a2i_IPADDRESS_NC) 1199LCRYPTO_ALIAS(a2i_IPADDRESS_NC);
1200 1200
1201 1201
1202int 1202int
@@ -1214,7 +1214,7 @@ a2i_ipadd(unsigned char *ipout, const char *ipasc)
1214 return 4; 1214 return 4;
1215 } 1215 }
1216} 1216}
1217LCRYPTO_ALIAS(a2i_ipadd) 1217LCRYPTO_ALIAS(a2i_ipadd);
1218 1218
1219static int 1219static int
1220ipv4_from_asc(unsigned char *v4, const char *in) 1220ipv4_from_asc(unsigned char *v4, const char *in)
@@ -1411,4 +1411,4 @@ X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk,
1411 } 1411 }
1412 return 1; 1412 return 1;
1413} 1413}
1414LCRYPTO_ALIAS(X509V3_NAME_from_section) 1414LCRYPTO_ALIAS(X509V3_NAME_from_section);