diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/x509/x509_conf.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c index b506d3ddfb..b6e5cd147a 100644 --- a/src/lib/libcrypto/x509/x509_conf.c +++ b/src/lib/libcrypto/x509/x509_conf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_conf.c,v 1.18 2024/06/24 06:32:04 tb Exp $ */ | 1 | /* $OpenBSD: x509_conf.c,v 1.19 2024/08/28 08:33:06 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 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -562,35 +562,25 @@ int | |||
562 | X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, | 562 | X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, |
563 | const char *section, X509 *cert) | 563 | const char *section, X509 *cert) |
564 | { | 564 | { |
565 | CONF ctmp; | 565 | X509V3error(ERR_R_DISABLED); |
566 | 566 | return 0; | |
567 | CONF_set_nconf(&ctmp, conf); | ||
568 | return X509V3_EXT_add_nconf(&ctmp, ctx, section, cert); | ||
569 | } | 567 | } |
570 | LCRYPTO_ALIAS(X509V3_EXT_add_conf); | 568 | LCRYPTO_ALIAS(X509V3_EXT_add_conf); |
571 | 569 | ||
572 | /* Same as above but for a CRL */ | ||
573 | |||
574 | int | 570 | int |
575 | X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, | 571 | X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, |
576 | const char *section, X509_CRL *crl) | 572 | const char *section, X509_CRL *crl) |
577 | { | 573 | { |
578 | CONF ctmp; | 574 | X509V3error(ERR_R_DISABLED); |
579 | 575 | return 0; | |
580 | CONF_set_nconf(&ctmp, conf); | ||
581 | return X509V3_EXT_CRL_add_nconf(&ctmp, ctx, section, crl); | ||
582 | } | 576 | } |
583 | LCRYPTO_ALIAS(X509V3_EXT_CRL_add_conf); | 577 | LCRYPTO_ALIAS(X509V3_EXT_CRL_add_conf); |
584 | 578 | ||
585 | /* Add extensions to certificate request */ | ||
586 | |||
587 | int | 579 | int |
588 | X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, | 580 | X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, |
589 | const char *section, X509_REQ *req) | 581 | const char *section, X509_REQ *req) |
590 | { | 582 | { |
591 | CONF ctmp; | 583 | X509V3error(ERR_R_DISABLED); |
592 | 584 | return 0; | |
593 | CONF_set_nconf(&ctmp, conf); | ||
594 | return X509V3_EXT_REQ_add_nconf(&ctmp, ctx, section, req); | ||
595 | } | 585 | } |
596 | LCRYPTO_ALIAS(X509V3_EXT_REQ_add_conf); | 586 | LCRYPTO_ALIAS(X509V3_EXT_REQ_add_conf); |