From: Geoff Thorpe <geoff@openssl.org>
Date: Mon, 17 May 2004 18:01:28 +0000 (+0000)
Subject: Moving opaque definitions to ossl_typ.h lets us reduce header dependencies.
X-Git-Tag: BEN_FIPS_TEST_6~14^2~254
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=678c1e025bcfb70b32c50dc1c9aba7e522a1fd70;p=oweals%2Fopenssl.git

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 f7c3054d8c..59da88ea02 100644
--- 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 7d3a75a619..68cc543402 100644
--- 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 46bc8c1a9a..5d9760bb7b 100644
--- 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)
 	{