Some more tweaks to ENGINE code.

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

diff --git a/crypto/engine/engine_int.h b/crypto/engine/engine_int.h
index 9c7471bebcb703492b8ca7744eed67e056f7cea2..dc5349cb3cbbe1f4a7c0130b9895bbdf6f39ea55 100644 (file)
--- a/crypto/engine/engine_int.h
+++ b/crypto/engine/engine_int.h
@@ -73,8 +73,8 @@
 extern "C" {
 #endif
 
-/* Bitwise OR-able values for the "flags" variable in ENGINE. */
-#define ENGINE_FLAGS_MALLOCED  0x0001
+/* 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. */
@@ -82,17 +82,17 @@ 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;
        int flags;
        /* reference count on the structure itself */
        int struct_ref;
@@ -113,29 +113,33 @@ 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 */
 
-#endif /* !NO_HW */
+#ifndef OPENSSL_NO_HW_UBSEC
+ENGINE *ENGINE_ubsec();
+#endif /* !OPENSSL_NO_HW_UBSEC */
+
+#endif /* !OPENSSL_NO_HW */
 
 #ifdef  __cplusplus
 }