summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2020-09-15 11:53:45 +0000
committerbeck <>2020-09-15 11:53:45 +0000
commitae829e60e2e59d44b8414fe32e951de15367a3f8 (patch)
treec53ad08a41a97e48317238635977ddae2d937e17
parenta5f3f173232d9eb13340725d93f9d979eae6167d (diff)
downloadopenbsd-ae829e60e2e59d44b8414fe32e951de15367a3f8.tar.gz
openbsd-ae829e60e2e59d44b8414fe32e951de15367a3f8.tar.bz2
openbsd-ae829e60e2e59d44b8414fe32e951de15367a3f8.zip
ifdef out code that is no longer used in here. once we are certain
of staying with the new name constraint code this will be deleted ok jsing@
-rw-r--r--src/lib/libcrypto/x509/x509_ncons.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_ncons.c b/src/lib/libcrypto/x509/x509_ncons.c
index 86b54513c7..1b0a4850d6 100644
--- a/src/lib/libcrypto/x509/x509_ncons.c
+++ b/src/lib/libcrypto/x509/x509_ncons.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_ncons.c,v 1.1 2020/06/04 15:19:31 jsing Exp $ */ 1/* $OpenBSD: x509_ncons.c,v 1.2 2020/09/15 11:53:45 beck 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 */
@@ -72,12 +72,14 @@ static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
72 STACK_OF(GENERAL_SUBTREE) *trees, BIO *bp, int ind, char *name); 72 STACK_OF(GENERAL_SUBTREE) *trees, BIO *bp, int ind, char *name);
73static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip); 73static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip);
74 74
75#if 0
75static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc); 76static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc);
76static int nc_match_single(GENERAL_NAME *sub, GENERAL_NAME *gen); 77static int nc_match_single(GENERAL_NAME *sub, GENERAL_NAME *gen);
77static int nc_dn(X509_NAME *sub, X509_NAME *nm); 78static int nc_dn(X509_NAME *sub, X509_NAME *nm);
78static int nc_dns(ASN1_IA5STRING *sub, ASN1_IA5STRING *dns); 79static int nc_dns(ASN1_IA5STRING *sub, ASN1_IA5STRING *dns);
79static int nc_email(ASN1_IA5STRING *sub, ASN1_IA5STRING *eml); 80static int nc_email(ASN1_IA5STRING *sub, ASN1_IA5STRING *eml);
80static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base); 81static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base);
82#endif
81 83
82const X509V3_EXT_METHOD v3_name_constraints = { 84const X509V3_EXT_METHOD v3_name_constraints = {
83 .ext_nid = NID_name_constraints, 85 .ext_nid = NID_name_constraints,
@@ -286,7 +288,7 @@ print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip)
286 BIO_printf(bp, "IP Address:<invalid>"); 288 BIO_printf(bp, "IP Address:<invalid>");
287 return 1; 289 return 1;
288} 290}
289 291#if 0
290/* Check a certificate conforms to a specified set of constraints. 292/* Check a certificate conforms to a specified set of constraints.
291 * Return values: 293 * Return values:
292 * X509_V_OK: All constraints obeyed. 294 * X509_V_OK: All constraints obeyed.
@@ -554,3 +556,4 @@ nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base)
554 556
555 return X509_V_OK; 557 return X509_V_OK;
556} 558}
559#endif