engine.h includes all the needed header files, so don't do it again

[openssl.git] / crypto / engine / engine_int.h

diff --git a/crypto/engine/engine_int.h b/crypto/engine/engine_int.h
index d4aa8faca212063f6ea27caa793ff992bf8c4780..addf6b533b08bd369a83b0f095678494e1456d57 100644 (file)
--- a/crypto/engine/engine_int.h
+++ b/crypto/engine/engine_int.h
@@ -59,60 +59,34 @@
 #ifndef HEADER_ENGINE_INT_H
 #define HEADER_ENGINE_INT_H
 
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/dh.h>
-#include <openssl/rand.h>
-#include <openssl/bn.h>
-#include <openssl/evp.h>
+/* Take public definitions from engine.h */
+#include <openssl/engine.h>
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-/* Bitwise OR-able values for the "flags" variable in ENGINE. */
-#define ENGINE_FLAGS_MALLOCED  0x0001
-
-#ifndef HEADER_ENGINE_H
-/* Regrettably, we need to reproduce the "BN" function types here
- * because there is no such "BIGNUM_METHOD" as there is with RSA,
- * DSA, etc. We do this so that we don't have a case where engine.h
- * and engine_int.h conflict with each other. */
-typedef int (*BN_MOD_EXP)(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-               const BIGNUM *m, BN_CTX *ctx);
- 
-/* private key operation for RSA, provided seperately in case other
- * RSA implementations wish to use it. */
-typedef int (*BN_MOD_EXP_CRT)(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-               const BIGNUM *q, const BIGNUM *dmp1, const BIGNUM *dmq1,
-               const BIGNUM *iqmp, BN_CTX *ctx);
-
-/* Generic function pointer */
-typedef int (*ENGINE_GEN_FUNC_PTR)();
-/* Generic function pointer taking no arguments */
-typedef int (*ENGINE_GEN_INT_FUNC_PTR)(void);
-/* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR)(int cmd, long i, void *p, void (*f)());
-
-#endif
+/* NB: Bitwise OR-able values for the "flags" variable in ENGINE are now exposed
+ * in engine.h. */
 
 /* This is a structure for storing implementations of various crypto
  * algorithms and functions. */
-typedef struct engine_st
+struct engine_st
        {
        const char *id;
        const char *name;
-       RSA_METHOD *rsa_meth;
-       DSA_METHOD *dsa_meth;
-       DH_METHOD *dh_meth;
-       RAND_METHOD *rand_meth;
+       const RSA_METHOD *rsa_meth;
+       const DSA_METHOD *dsa_meth;
+       const DH_METHOD *dh_meth;
+       const RAND_METHOD *rand_meth;
        BN_MOD_EXP bn_mod_exp;
        BN_MOD_EXP_CRT bn_mod_exp_crt;
-       int (*init)(void);
-       int (*finish)(void);
-       int (*ctrl)(int cmd, long i, void *p, void (*f)());
-       EVP_PKEY *(*load_privkey)(const char *key_id, const char *passphrase);
-       EVP_PKEY *(*load_pubkey)(const char *key_id, const char *passphrase);
+       ENGINE_GEN_INT_FUNC_PTR init;
+       ENGINE_GEN_INT_FUNC_PTR finish;
+       ENGINE_CTRL_FUNC_PTR ctrl;
+       ENGINE_LOAD_KEY_PTR load_privkey;
+       ENGINE_LOAD_KEY_PTR load_pubkey;
+       const ENGINE_CMD_DEFN *cmd_defns;
        int flags;
        /* reference count on the structure itself */
        int struct_ref;
@@ -125,7 +99,7 @@ typedef struct engine_st
        /* Used to maintain the linked-list of engines. */
        struct engine_st *prev;
        struct engine_st *next;
-       } ENGINE;
+       };
 
 /* BUILT-IN ENGINES. (these functions are only ever called once and
  * do not return references - they are purely for bootstrapping). */
@@ -133,29 +107,33 @@ typedef struct engine_st
 /* Returns a structure of software only methods (the default). */
 ENGINE *ENGINE_openssl();
 
-#ifndef NO_HW
+#ifndef OPENSSL_NO_HW
 
-#ifndef NO_HW_CSWIFT
+#ifndef OPENSSL_NO_HW_CSWIFT
 /* Returns a structure of cswift methods ... NB: This can exist and be
  * "used" even on non-cswift systems because the "init" will fail if the
  * card/library are not found. */
 ENGINE *ENGINE_cswift();
-#endif /* !NO_HW_CSWIFT */
+#endif /* !OPENSSL_NO_HW_CSWIFT */
 
-#ifndef NO_HW_NCIPHER
+#ifndef OPENSSL_NO_HW_NCIPHER
 ENGINE *ENGINE_ncipher();
-#endif /* !NO_HW_NCIPHER */
+#endif /* !OPENSSL_NO_HW_NCIPHER */
 
-#ifndef NO_HW_ATALLA
+#ifndef OPENSSL_NO_HW_ATALLA
 /* Returns a structure of atalla methods. */
 ENGINE *ENGINE_atalla();
-#endif /* !NO_HW_ATALLA */
+#endif /* !OPENSSL_NO_HW_ATALLA */
 
-#ifndef NO_HW_NURON
+#ifndef OPENSSL_NO_HW_NURON
 ENGINE *ENGINE_nuron();
-#endif /* !NO_HW_NURON */
+#endif /* !OPENSSL_NO_HW_NURON */
+
+#ifndef OPENSSL_NO_HW_UBSEC
+ENGINE *ENGINE_ubsec();
+#endif /* !OPENSSL_NO_HW_UBSEC */
 
-#endif /* !NO_HW */
+#endif /* !OPENSSL_NO_HW */
 
 #ifdef  __cplusplus
 }