Moving opaque definitions to ossl_typ.h lets us reduce header dependencies.

Deprecate inclusion of crypto.h from ui.h.

diff --git a/crypto/ui/ui.h b/crypto/ui/ui.h
index f7c3054d8c20788558c1bad0ef3f9ca81bb16206..59da88ea02e512c5dfe6983860351bb2ff0cf54e 100644 (file)
--- a/crypto/ui/ui.h
+++ b/crypto/ui/ui.h
@@ -59,7 +59,9 @@
 #ifndef HEADER_UI_H
 #define HEADER_UI_H
 
+#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/crypto.h>
+#endif
 #include <openssl/safestack.h>
 #include <openssl/ossl_typ.h>
 

diff --git a/crypto/ui/ui_locl.h b/crypto/ui/ui_locl.h
index 7d3a75a619c71b0cbcb5aacd2a66d09cf1d88ee9..68cc54340238bae2faf213c3d783e9c4e71c85ed 100644 (file)
--- a/crypto/ui/ui_locl.h
+++ b/crypto/ui/ui_locl.h
@@ -60,6 +60,7 @@
 #define HEADER_UI_LOCL_H
 
 #include <openssl/ui.h>
+#include <openssl/crypto.h>
 
 struct ui_method_st
        {

diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c
index 46bc8c1a9a08f48496b7de645717fcb0e7d306e0..5d9760bb7b3ff4d02460571122a1457f525eb6cf 100644 (file)
--- a/crypto/ui/ui_util.c
+++ b/crypto/ui/ui_util.c
@@ -54,7 +54,7 @@
  */
 
 #include <string.h>
-#include <openssl/ui.h>
+#include "ui_locl.h"
 
 int UI_UTIL_read_pw_string(char *buf,int length,const char *prompt,int verify)
        {