The 'name', 'value' and 'section' arguments for a2i_GENERAL_NAME(),

X509V3_get_value_bool(), X509V3_add_value_bool_nf(),
X509V3_get_value_int(), X509V3_get_string(), X509V3_get_section()
are now const.

While there, remove a stupid cast and two redundant checks.

tested in a bulk build by sthen
ok jsing

1 files changed, 5 insertions, 9 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_conf.c b/src/lib/libcrypto/x509v3/v3_conf.c
index bb06c18536..78ff19808b 100644
--- a/src/lib/libcrypto/x509v3/v3_conf.c
+++ b/src/lib/libcrypto/x509v3/v3_conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_conf.c,v 1.22 2018/05/13 17:49:02 tb Exp $ */
+/* $OpenBSD: v3_conf.c,v 1.23 2018/05/18 19:34:37 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -411,27 +411,23 @@ X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
 /* Config database functions */
 
 char *
-X509V3_get_string(X509V3_CTX *ctx, char *name, char *section)
+X509V3_get_string(X509V3_CTX *ctx, const char *name, const char *section)
 {
         if (!ctx->db || !ctx->db_meth || !ctx->db_meth->get_string) {
                 X509V3error(X509V3_R_OPERATION_NOT_DEFINED);
                 return NULL;
         }
-        if (ctx->db_meth->get_string)
-                return ctx->db_meth->get_string(ctx->db, name, section);
-        return NULL;
+        return ctx->db_meth->get_string(ctx->db, name, section);
 }
 
 STACK_OF(CONF_VALUE) *
-X509V3_get_section(X509V3_CTX *ctx, char *section)
+X509V3_get_section(X509V3_CTX *ctx, const char *section)
 {
         if (!ctx->db || !ctx->db_meth || !ctx->db_meth->get_section) {
                 X509V3error(X509V3_R_OPERATION_NOT_DEFINED);
                 return NULL;
         }
-        if (ctx->db_meth->get_section)
-                return ctx->db_meth->get_section(ctx->db, section);
-        return NULL;
+        return ctx->db_meth->get_section(ctx->db, section);
 }
 
 void