diff options
author | inoguchi <> | 2020-09-16 12:51:15 +0000 |
---|---|---|
committer | inoguchi <> | 2020-09-16 12:51:15 +0000 |
commit | bac34e6a9c63e34632ddd7154da5de3ff012e394 (patch) | |
tree | f395e02dac842972063342fa134f4976dae6b722 | |
parent | 4d4b6ca21abb045b3f6584cc35a22ad4ab7a719a (diff) | |
download | openbsd-bac34e6a9c63e34632ddd7154da5de3ff012e394.tar.gz openbsd-bac34e6a9c63e34632ddd7154da5de3ff012e394.tar.bz2 openbsd-bac34e6a9c63e34632ddd7154da5de3ff012e394.zip |
noop NAME_CONSTRAINTS_check stub
On OSX and Windows platform portable build fails since it can't find
NAME_CONSTRAINTS_check.
It is still remain in x509v3.h and Symbols.list but '#if 0'ed from
x509_ncons.c.
In this situation, some platforms appears to get error.
Add noop NAME_CONSTRAINTS_check stub to solve this issue.
ok beck@
-rw-r--r-- | src/lib/libcrypto/x509/x509_ncons.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509_ncons.c b/src/lib/libcrypto/x509/x509_ncons.c index 1b0a4850d6..4f12542492 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.2 2020/09/15 11:53:45 beck Exp $ */ | 1 | /* $OpenBSD: x509_ncons.c,v 1.3 2020/09/16 12:51:15 inoguchi 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 | */ |
@@ -288,7 +288,7 @@ print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip) | |||
288 | BIO_printf(bp, "IP Address:<invalid>"); | 288 | BIO_printf(bp, "IP Address:<invalid>"); |
289 | return 1; | 289 | return 1; |
290 | } | 290 | } |
291 | #if 0 | 291 | |
292 | /* Check a certificate conforms to a specified set of constraints. | 292 | /* Check a certificate conforms to a specified set of constraints. |
293 | * Return values: | 293 | * Return values: |
294 | * X509_V_OK: All constraints obeyed. | 294 | * X509_V_OK: All constraints obeyed. |
@@ -303,6 +303,7 @@ print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip) | |||
303 | int | 303 | int |
304 | NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc) | 304 | NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc) |
305 | { | 305 | { |
306 | #if 0 | ||
306 | int r, i; | 307 | int r, i; |
307 | X509_NAME *nm; | 308 | X509_NAME *nm; |
308 | 309 | ||
@@ -347,10 +348,10 @@ NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc) | |||
347 | if (r != X509_V_OK) | 348 | if (r != X509_V_OK) |
348 | return r; | 349 | return r; |
349 | } | 350 | } |
350 | 351 | #endif | |
351 | return X509_V_OK; | 352 | return X509_V_OK; |
352 | } | 353 | } |
353 | 354 | #if 0 | |
354 | static int | 355 | static int |
355 | nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc) | 356 | nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc) |
356 | { | 357 | { |