summaryrefslogtreecommitdiffstats
path: root/crypto/ui
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2004-04-19 17:46:04 +0000
committerGeoff Thorpe <geoff@openssl.org>2004-04-19 17:46:04 +0000
commit3a87a9b9db07f8d3c6d9aa7f20e01f053007a703 (patch)
tree543949ed3523920985fe649a5ebe3945c8112391 /crypto/ui
parentae44fc1ec4c0d6c125c28f52dc06e9ae87c59c4c (diff)
Reduce header interdependencies, initially in engine.h (the rest of the
changes are the fallout). As this could break source code that doesn't directly include headers for interfaces it uses, changes to recursive includes are covered by the OPENSSL_NO_DEPRECATED symbol. It's better to define this when building and using openssl, and then adapt code where necessary - this is how to stay current. However the mechanism exists for the lethargic.
Diffstat (limited to 'crypto/ui')
-rw-r--r--crypto/ui/ui.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/crypto/ui/ui.h b/crypto/ui/ui.h
index 735a2d988e..f7c3054d8c 100644
--- a/crypto/ui/ui.h
+++ b/crypto/ui/ui.h
@@ -61,23 +61,15 @@
#include <openssl/crypto.h>
#include <openssl/safestack.h>
+#include <openssl/ossl_typ.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* The UI type is a holder for a specific user interface session. It can
- contain an illimited number of informational or error strings as well
- as things to prompt for, both passwords (noecho mode) and others (echo
- mode), and verification of the same. All of these are called strings,
- and are further described below. */
-typedef struct ui_st UI;
-
-/* All instances of UI have a reference to a method structure, which is a
- ordered vector of functions that implement the lower level things to do.
- There is an instruction on the implementation further down, in the section
- for method implementors. */
-typedef struct ui_method_st UI_METHOD;
+/* Declared already in ossl_typ.h */
+/* typedef struct ui_st UI; */
+/* typedef struct ui_method_st UI_METHOD; */
/* All the following functions return -1 or NULL on error and in some cases