diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-08-12 16:55:25 -0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-10-06 10:55:02 +0200 |
| commit | 7cfc0a555c85220ecfd6ed038a7b859668595b72 (patch) | |
| tree | f4c44f92397f3791bf3576103faf40bb42163cc4 /crypto/conf | |
| parent | 833f7c8c55c3c8a572db2112a5c2eac92c8262b8 (diff) | |
Deprecate NCONF_WIN32() function
Extensive documentation added in HISTORY section in doc/man5/config.pod
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9578)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_def.c | 16 | ||||
| -rw-r--r-- | crypto/conf/conf_def.h | 2 | ||||
| -rw-r--r-- | crypto/conf/keysets.pl | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index ff4c43fc75..a43225ecf7 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -54,7 +54,9 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx); static CONF *def_create(CONF_METHOD *meth); static int def_init_default(CONF *conf); +#if !OPENSSL_API_3 static int def_init_WIN32(CONF *conf); +#endif static int def_destroy(CONF *conf); static int def_destroy_data(CONF *conf); static int def_load(CONF *conf, const char *name, long *eline); @@ -76,6 +78,12 @@ static CONF_METHOD default_method = { def_load }; +CONF_METHOD *NCONF_default(void) +{ + return &default_method; +} + +#if ! OPENSSL_API_3 static CONF_METHOD WIN32_method = { "WIN32", def_create, @@ -89,15 +97,11 @@ static CONF_METHOD WIN32_method = { def_load }; -CONF_METHOD *NCONF_default(void) -{ - return &default_method; -} - CONF_METHOD *NCONF_WIN32(void) { return &WIN32_method; } +#endif static CONF *def_create(CONF_METHOD *meth) { @@ -124,6 +128,7 @@ static int def_init_default(CONF *conf) return 1; } +#if ! OPENSSL_API_3 static int def_init_WIN32(CONF *conf) { if (conf == NULL) @@ -135,6 +140,7 @@ static int def_init_WIN32(CONF *conf) return 1; } +#endif static int def_destroy(CONF *conf) { diff --git a/crypto/conf/conf_def.h b/crypto/conf/conf_def.h index 9b2a3c1bb9..725c430c63 100644 --- a/crypto/conf/conf_def.h +++ b/crypto/conf/conf_def.h @@ -56,6 +56,7 @@ static const unsigned short CONF_type_default[128] = { 0x0004, 0x0004, 0x0004, 0x0000, 0x0200, 0x0000, 0x0200, 0x0000, }; +#if ! OPENSSL_API_3 static const unsigned short CONF_type_win32[128] = { 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, @@ -74,3 +75,4 @@ static const unsigned short CONF_type_win32[128] = { 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0000, 0x0200, 0x0000, 0x0200, 0x0000, }; +#endif diff --git a/crypto/conf/keysets.pl b/crypto/conf/keysets.pl index 68addbfe20..05b086f7fa 100644 --- a/crypto/conf/keysets.pl +++ b/crypto/conf/keysets.pl @@ -108,9 +108,11 @@ for ($i = 0; $i < 128; $i++) { } print "\n};\n\n"; +print "#if ! OPENSSL_API_3\n"; print "static const unsigned short CONF_type_win32[128] = {"; for ($i = 0; $i < 128; $i++) { print "\n " if ($i % 8) == 0; printf " 0x%04X,", $V_w32[$i]; } print "\n};\n"; +print "#endif\n"; |