3 files changed, 16 insertions, 92 deletions

diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c
index 0d5a67d9a5..f04243d36c 100644
--- a/src/lib/libcrypto/conf/conf_api.c
+++ b/src/lib/libcrypto/conf/conf_api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_api.c,v 1.29 2025/12/21 07:31:22 tb Exp $ */
+/* $OpenBSD: conf_api.c,v 1.30 2026/06/22 08:45:55 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -76,12 +76,13 @@ _CONF_get_section(const CONF *conf, const char *section)
 {
         CONF_VALUE *v, vv;
 
-        if ((conf == NULL) || (section == NULL))
-                return (NULL);
+        if (conf == NULL || section == NULL)
+                return NULL;
         vv.name = NULL;
         vv.section = (char *)section;
         v = lh_CONF_VALUE_retrieve(conf->data, &vv);
-        return (v);
+
+        return v;
 }
 
 int
@@ -113,24 +114,24 @@ _CONF_get_string(const CONF *conf, const char *section, const char *name)
         CONF_VALUE *v, vv;
 
         if (name == NULL)
-                return (NULL);
+                return NULL;
         if (conf != NULL) {
                 if (section != NULL) {
                         vv.name = (char *)name;
                         vv.section = (char *)section;
                         v = lh_CONF_VALUE_retrieve(conf->data, &vv);
                         if (v != NULL)
-                                return (v->value);
+                                return v->value;
                 }
                 vv.section = "default";
                 vv.name = (char *)name;
                 v = lh_CONF_VALUE_retrieve(conf->data, &vv);
                 if (v != NULL)
-                        return (v->value);
+                        return v->value;
                 else
-                        return (NULL);
+                        return NULL;
         } else
-                return (NULL);
+                return NULL;
 }
 
 static unsigned long
@@ -149,15 +150,15 @@ conf_value_cmp(const CONF_VALUE *a, const CONF_VALUE *b)
         if (a->section != b->section) {
                 i = strcmp(a->section, b->section);
                 if (i)
-                        return (i);
+                        return i;
         }
         if ((a->name != NULL) && (b->name != NULL)) {
                 i = strcmp(a->name, b->name);
-                return (i);
+                return i;
         } else if (a->name == b->name)
-                return (0);
+                return 0;
         else
-                return ((a->name == NULL)?-1 : 1);
+                return a->name == NULL ? -1 : 1;
 }
 
 static IMPLEMENT_LHASH_COMP_FN(conf_value, CONF_VALUE)
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c
index 6e697cc478..f90cf0f729 100644
--- a/src/lib/libcrypto/conf/conf_mod.c
+++ b/src/lib/libcrypto/conf/conf_mod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_mod.c,v 1.41 2025/05/10 05:54:38 tb Exp $ */
+/* $OpenBSD: conf_mod.c,v 1.42 2026/07/31 00:50:52 kenjiro Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -65,6 +65,7 @@
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 
+#include "conf_local.h"
 #include "err_local.h"
 
 /* This structure contains data about supported modules. */
diff --git a/src/lib/libcrypto/conf/ssleay.cnf b/src/lib/libcrypto/conf/ssleay.cnf
deleted file mode 100644
index ed33af601e..0000000000
--- a/src/lib/libcrypto/conf/ssleay.cnf
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# This is a test configuration file for use in SSLeay etc...
-#
-
-init = 5
-in\#it1 =10
-init2='10'
-init3='10\''
-init4="10'"
-init5='='10\'' again'
-
-SSLeay::version = 0.5.0
-
-[genrsa]
-default_bits    = 512
-SSLEAY::version = 0.5.0
-
-[gendh]
-default_bits    = 512
-def_generator   = 2
-
-[s_client]
-cipher1         = DES_CBC_MD5:DES_CBC_SHA:DES_EDE_SHA:RC4_MD5\
-cipher2         = 'DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5'
-cipher3         = "DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5"
-cipher4         = DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5
-
-[ default ]
-cert_dir        = $ENV::HOME/.ca_certs
-
-HOME            = /tmp/eay
-
-tmp_cert_dir    = $HOME/.ca_certs
-tmp2_cert_dir   = thisis$(HOME)stuff
-
-LOGNAME = Eric Young (home=$HOME)
-
-[ special ]
-
-H=$HOME
-H=$default::HOME
-H=$ENV::HOME
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-
-RANDFILE                = $HOME/.rand
-
-[ req ]
-default_bits            = 512
-default_keyfile         = privkey.pem
-
-Attribute_type_1        = countryName
-Attribute_text_1        = Country Name (2 letter code)
-Attribute_default_1     = AU
-
-Attribute_type_2        = stateOrProvinceName
-Attribute_text_2        = State or Province Name (full name)
-Attribute_default_2     = Queensland
-
-Attribute_type_3        = localityName
-Attribute_text_3        = Locality Name (eg, city)
-
-Attribute_type_4        = organizationName
-Attribute_text_4        = Organization Name (eg, company)
-Attribute_default_4     = Mincom Pty Ltd
-
-Attribute_type_5        = organizationalUnitName
-Attribute_text_5        = Organizational Unit Name (eg, section)
-Attribute_default_5     = TR
-
-Attribute_type_6        = commonName
-Attribute_text_6        = Common Name (eg, YOUR name)
-
-Attribute_type_7        = emailAddress
-Attribute_text_7        = Email Address
-