components/openssl: change header file relationship of level

diff --git a/components/openssl/include/internal/ssl_stack.h b/components/openssl/include/internal/ssl_stack.h
index b37c8dffa98f6dd461e50116b34cd368bebb39ce..7a7051a026b3e0dd7c77126dc6c582fe155fa5ff 100644 (file)
--- a/components/openssl/include/internal/ssl_stack.h
+++ b/components/openssl/include/internal/ssl_stack.h
@@ -7,6 +7,17 @@
 
 #include "ssl_types.h"
 
+#define STACK_OF(type)  struct stack_st_##type
+
+#define SKM_DEFINE_STACK_OF(t1, t2, t3) \
+    STACK_OF(t1); \
+    static ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void) \
+    { \
+        return (STACK_OF(t1) *)OPENSSL_sk_new_null(); \
+    } \
+
+#define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t)
+
 /**
  * @brief create a openssl stack object
  *

diff --git a/components/openssl/include/internal/ssl_types.h b/components/openssl/include/internal/ssl_types.h
index 19944c78191614059a087c5091d804d0ea0a9a94..5aaee941767ac93862e2ec76e68c5ce3a683ab68 100644 (file)
--- a/components/openssl/include/internal/ssl_types.h
+++ b/components/openssl/include/internal/ssl_types.h
@@ -37,17 +37,6 @@ typedef void BIO;
 #define X509_METHOD_CALL(f, x, ...)       x->method->x509_##f(x, ##__VA_ARGS__)
 #define EVP_PKEY_METHOD_CALL(f, k, ...)   k->method->pkey_##f(k, ##__VA_ARGS__)
 
-#define STACK_OF(type)  struct stack_st_##type
-
-#define SKM_DEFINE_STACK_OF(t1, t2, t3) \
-    STACK_OF(t1); \
-    static ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_new_null(); \
-    } \
-
-#define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t)
-
 typedef int (*OPENSSL_sk_compfunc)(const void *, const void *);
 
 struct stack_st;

diff --git a/components/openssl/include/openssl/ssl.h b/components/openssl/include/openssl/ssl.h
index d8400e66b5df99b53dff5a7ee8af9ea857f5e158..7f8eb88302fc4139c2f94fff1009b6e523d6033c 100644 (file)
--- a/components/openssl/include/openssl/ssl.h
+++ b/components/openssl/include/openssl/ssl.h
@@ -19,7 +19,6 @@
  extern "C" {\r
 #endif\r
 \r
-#include "platform/ssl_port.h"\r
 #include "internal/ssl_x509.h"\r
 #include "internal/ssl_pkey.h"\r
 \r