Fix safestack issues in ui.h

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)

diff --git a/.gitignore b/.gitignore
index a173bbfe13951a8fdc741ad02b26fef7512d540e..8f4bc6af85b549bccd10a3acd2f994b19d9863bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@
 /include/openssl/safestack.h
 /include/openssl/srp.h
 /include/openssl/ssl.h
+/include/openssl/ui.h
 /include/openssl/x509.h
 /include/openssl/x509v3.h
 /include/openssl/x509_vfy.h

diff --git a/build.info b/build.info
index a5f6498ac205fed311dbef7eb10a7badc024212a..8aa668e9139b1dbc8c6a89f4e2ee6538a7f09763 100644 (file)
--- a/build.info
+++ b/build.info
@@ -32,6 +32,7 @@ DEPEND[]=include/openssl/asn1.h \
          include/openssl/safestack.h \
          include/openssl/srp.h \
          include/openssl/ssl.h \
+         include/openssl/ui.h \
          include/openssl/x509.h \
          include/openssl/x509v3.h \
          include/openssl/x509_vfy.h \
@@ -57,6 +58,7 @@ GENERATE[include/openssl/pkcs7.h]=include/openssl/pkcs7.h.in
 GENERATE[include/openssl/safestack.h]=include/openssl/safestack.h.in
 GENERATE[include/openssl/srp.h]=include/openssl/srp.h.in
 GENERATE[include/openssl/ssl.h]=include/openssl/ssl.h.in
+GENERATE[include/openssl/ui.h]=include/openssl/ui.h.in
 GENERATE[include/openssl/x509.h]=include/openssl/x509.h.in
 GENERATE[include/openssl/x509v3.h]=include/openssl/x509v3.h.in
 GENERATE[include/openssl/x509_vfy.h]=include/openssl/x509_vfy.h.in

diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index 8c6dc6dd89981348f89a811a264b2c845bbfaa21..017afb7c07f028fc3678f906c1a48cbb4c80b725 100644 (file)
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -15,8 +15,6 @@
 #include <openssl/err.h>
 #include "ui_local.h"
 
-DEFINE_STACK_OF(UI_STRING)
-
 UI *UI_new(void)
 {
     return UI_new_method(NULL);

diff --git a/include/openssl/ui.h b/include/openssl/ui.h.in
similarity index 99%
rename from include/openssl/ui.h
rename to include/openssl/ui.h.in
index f68a4e90a81a8d5c3caeb34765c363346be74b97..eb9a580fa8f4aaab3ec09b02c1200def2d8da3ea 100644 (file)
--- a/include/openssl/ui.h
+++ b/include/openssl/ui.h.in
@@ -1,4 +1,6 @@
 /*
+ * {- join("\n * ", @autowarntext) -}
+ *
  * Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -7,6 +9,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+{-
+use OpenSSL::stackhash qw(generate_stack_macros);
+-}
+
 #ifndef OPENSSL_UI_H
 # define OPENSSL_UI_H
 # pragma once
@@ -285,7 +291,9 @@ const UI_METHOD *UI_null(void);
  */
 typedef struct ui_string_st UI_STRING;
 
-DEFINE_OR_DECLARE_STACK_OF(UI_STRING)
+{-
+    generate_stack_macros("UI_STRING");
+-}
 
 /*
  * The different types of strings that are currently supported. This is only