RSA_METHOD now supports key-generation, but (for now) none of these

[openssl.git] / engines / e_ubsec.c

diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c
index ed8401ec162655ed0948b1caa4ae1efa08fe4a50..afb0c9ece6618249abcf68aeede471fe780c92ac 100644 (file)
--- a/engines/e_ubsec.c
+++ b/engines/e_ubsec.c
@@ -59,8 +59,9 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

+#include <string.h>

 #include <openssl/crypto.h>
 #include <openssl/crypto.h>

-#include "cryptlib.h"
+#include <openssl/buffer.h>

 #include <openssl/dso.h>
 #include <openssl/engine.h>
 
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 


@@ -74,7 +75,7 @@
 #endif
 
 #define UBSEC_LIB_NAME "ubsec engine"
 #endif
 
 #define UBSEC_LIB_NAME "ubsec engine"

-#include "hw_ubsec_err.c"
+#include "e_ubsec_err.c"

 
 #define FAIL_TO_SOFTWARE -15
 
 
 #define FAIL_TO_SOFTWARE -15
 


@@ -143,6 +144,7 @@ static RSA_METHOD ubsec_rsa =
        0,
        NULL,
        NULL,
        0,
        NULL,
        NULL,

+       NULL,

        NULL
        };
 #endif
        NULL
        };
 #endif


@@ -242,6 +244,7 @@ static int bind_helper(ENGINE *e)
        return 1;
        }
 
        return 1;
        }
 

+#ifdef OPENSSL_NO_DYNAMIC_ENGINE

 static ENGINE *engine_ubsec(void)
        {
        ENGINE *ret = ENGINE_new();
 static ENGINE *engine_ubsec(void)
        {
        ENGINE *ret = ENGINE_new();


@@ -264,6 +267,7 @@ void ENGINE_load_ubsec(void)
        ENGINE_free(toadd);
        ERR_clear_error();
        }
        ENGINE_free(toadd);
        ERR_clear_error();
        }

+#endif

 
 /* This is a process-global DSO handle used for loading and unloading
  * the UBSEC library. NB: This is only set (or unset) during an
 
 /* This is a process-global DSO handle used for loading and unloading
  * the UBSEC library. NB: This is only set (or unset) during an


@@ -1042,7 +1046,7 @@ static int ubsec_rand_status(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */

-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE

 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_ubsec_id) != 0))
 static int bind_fn(ENGINE *e, const char *id)
        {
        if(id && (strcmp(id, engine_ubsec_id) != 0))


@@ -1053,7 +1057,7 @@ static int bind_fn(ENGINE *e, const char *id)
        }
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
        }
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)

-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */

 
 #endif /* !OPENSSL_NO_HW_UBSEC */
 #endif /* !OPENSSL_NO_HW */
 
 #endif /* !OPENSSL_NO_HW_UBSEC */
 #endif /* !OPENSSL_NO_HW */