X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=engines%2Fe_sureware.c;h=8e77e5c282fb05dbddbcb619200a84f505a6c34e;hb=dc90f64d563f2c9709749d0731d6b26c6bce5325;hp=dced97c695a568f3cffed2942e92c8a715321684;hpb=665dc3924d4f7771dbe17b7518ce3c6d3694a352;p=oweals%2Fopenssl.git

diff --git a/engines/e_sureware.c b/engines/e_sureware.c
index dced97c695..8e77e5c282 100644
--- a/engines/e_sureware.c
+++ b/engines/e_sureware.c
@@ -51,6 +51,7 @@
 ====================================================================*/
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
 #include <openssl/dso.h>
@@ -68,7 +69,7 @@
 #define SUREWARE_LIB_NAME "sureware engine"
 #include "e_sureware_err.c"
 
-static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 static int surewarehk_destroy(ENGINE *e);
 static int surewarehk_init(ENGINE *e);
 static int surewarehk_finish(ENGINE *e);
@@ -121,7 +122,8 @@ static RSA_METHOD surewarehk_rsa =
 	0,	/* RSA flag*/
 	NULL, 
 	NULL, /* OpenSSL sign*/
-	NULL  /* OpenSSL verify*/
+	NULL, /* OpenSSL verify*/
+	NULL  /* keygen */
 	};
 #endif
 
@@ -143,7 +145,8 @@ static DH_METHOD surewarehk_dh =
 	NULL, /* init*/
 	NULL, /* finish*/
 	0,    /* flags*/
-	NULL 
+	NULL,
+	NULL
 	};
 #endif
 
@@ -192,6 +195,8 @@ static DSA_METHOD surewarehk_dsa =
 	NULL,/*finish*/
 	0,
 	NULL,
+	NULL,
+	NULL
 	};
 #endif
 
@@ -363,7 +368,7 @@ static BIO *logstream = NULL;
  * called, the checking and error handling is probably down there. 
 */
 static int threadsafe=1;
-static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 {
 	int to_return = 1;
 
@@ -905,7 +910,7 @@ static int surewarehk_rsa_priv_dec(int flen,const unsigned char *from,unsigned c
 err:
 	if (buf)
 	{
-		memset(buf,0,tlen);
+		OPENSSL_cleanse(buf,tlen);
 		OPENSSL_free(buf);
 	}
 	return ret;