summaryrefslogtreecommitdiff
path: root/lib/libcrypto
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2020-09-15 11:53:46 +0000
committerBob Beck <beck@cvs.openbsd.org>2020-09-15 11:53:46 +0000
commitd5720e737da97c43a271e641634a7c8887410a73 (patch)
tree3a110d418210975efb721a46419bc6348ac3856a /lib/libcrypto
parent9991cc72a5fa860c8ba822976262c1cb32f3e13a (diff)
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@
Diffstat (limited to 'lib/libcrypto')
-rw-r--r--lib/libcrypto/x509/x509_ncons.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/libcrypto/x509/x509_ncons.c b/lib/libcrypto/x509/x509_ncons.c
index 86b54513c7c..1b0a4850d65 100644
--- a/lib/libcrypto/x509/x509_ncons.c
+++ b/lib/libcrypto/x509/x509_ncons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_ncons.c,v 1.1 2020/06/04 15:19:31 jsing Exp $ */
+/* $OpenBSD: x509_ncons.c,v 1.2 2020/09/15 11:53:45 beck Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
*/
@@ -72,12 +72,14 @@ static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
STACK_OF(GENERAL_SUBTREE) *trees, BIO *bp, int ind, char *name);
static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip);
+#if 0
static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc);
static int nc_match_single(GENERAL_NAME *sub, GENERAL_NAME *gen);
static int nc_dn(X509_NAME *sub, X509_NAME *nm);
static int nc_dns(ASN1_IA5STRING *sub, ASN1_IA5STRING *dns);
static int nc_email(ASN1_IA5STRING *sub, ASN1_IA5STRING *eml);
static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base);
+#endif
const X509V3_EXT_METHOD v3_name_constraints = {
.ext_nid = NID_name_constraints,
@@ -286,7 +288,7 @@ print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip)
BIO_printf(bp, "IP Address:<invalid>");
return 1;
}
-
+#if 0
/* Check a certificate conforms to a specified set of constraints.
* Return values:
* X509_V_OK: All constraints obeyed.
@@ -554,3 +556,4 @@ nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base)
return X509_V_OK;
}
+#endif