From f8a5dbfe6a53b24c6c1009bc2003452db86942d3 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Fri, 2 Aug 2019 09:13:37 +0000 Subject: [PATCH] Merge of r1863635 from trunk: *) md_crypt: Wrap get_ct_scts_nid(void) definition to avoid unused function error when building in maintainer mode. [jim] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1864209 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 7 ------- modules/md/md_crypt.c | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/STATUS b/STATUS index e178a0b8a5d..06f55f15b22 100644 --- a/STATUS +++ b/STATUS @@ -127,13 +127,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) md_crypt: Wrap get_ct_scts_nid(void) definition to avoid unused function error - when building in maintainer mode. - trunk: - http://svn.apache.org/1863635 - 2.4.x patch: svn merge -c 1863635 ^/httpd/httpd/trunk . - +1: jim, icing, rpluem - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c index acb62d34568..c9f73614cd5 100644 --- a/modules/md/md_crypt.c +++ b/modules/md/md_crypt.c @@ -1485,6 +1485,7 @@ out: #define MD_OID_CT_SCTS_SNAME "CT-SCTs" #define MD_OID_CT_SCTS_LNAME "CT Certificate SCTs" +#ifndef OPENSSL_NO_CT static int get_ct_scts_nid(void) { int nid = OBJ_txt2nid(MD_OID_CT_SCTS_NUM); @@ -1494,6 +1495,7 @@ static int get_ct_scts_nid(void) } return nid; } +#endif const char *md_nid_get_sname(int nid) { -- 2.47.3