wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Synchronise with 0.9.7-stable.

Browse source
This commit is contained in:
Richard Levitte 2002-04-29 10:19:19 +00:00
parent 8df61b5011
commit d4294c8984
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
crypto/engine/hw_4758_cca.c
View file

@ -287,13 +287,13 @@ err:
DSO_free(dso); DSO_free(dso);
dso = NULL; dso = NULL;
keyRecordRead = (F_KEYRECORDREAD)NULL; keyRecordRead = (F_KEYRECORDREAD)0;
randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL; randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL; digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL; digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL; publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
pkaEncrypt = (F_PKAENCRYPT)NULL; pkaEncrypt = (F_PKAENCRYPT)0;
pkaDecrypt = (F_PKADECRYPT)NULL; pkaDecrypt = (F_PKADECRYPT)0;
return 0; return 0;
} }
@ -312,13 +312,13 @@ static int ibm_4758_cca_finish(ENGINE *e)
return 0; return 0;
} }
dso = NULL; dso = NULL;
keyRecordRead = (F_KEYRECORDREAD)NULL; keyRecordRead = (F_KEYRECORDREAD)0;
randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL; randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL; digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL; digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL; publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
pkaEncrypt = (F_PKAENCRYPT)NULL; pkaEncrypt = (F_PKAENCRYPT)0;
pkaDecrypt = (F_PKADECRYPT)NULL; pkaDecrypt = (F_PKADECRYPT)0;
return 1; return 1;
} }

8
crypto/engine/hw_sureware.c
View file

@ -95,10 +95,10 @@ static EVP_PKEY *surewarehk_load_privkey(ENGINE *e, const char *key_id,
static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id, static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
UI_METHOD *ui_method, void *callback_data); UI_METHOD *ui_method, void *callback_data);
static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
int index_,long argl, void *argp); int idx,long argl, void *argp);
#if 0 #if 0
static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
int index_,long argl, void *argp); int idx,long argl, void *argp);
#endif #endif
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
@ -816,7 +816,7 @@ static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
/* This cleans up an RSA/DSA KM key(do not destroy the key into the hardware) /* This cleans up an RSA/DSA KM key(do not destroy the key into the hardware)
, called when ex_data is freed */ , called when ex_data is freed */
static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
int index_,long argl, void *argp) int idx,long argl, void *argp)
{ {
if(!p_surewarehk_Free) if(!p_surewarehk_Free)
{ {
@ -831,7 +831,7 @@ static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
/* This cleans up an DH KM key (destroys the key into hardware), /* This cleans up an DH KM key (destroys the key into hardware),
called when ex_data is freed */ called when ex_data is freed */
static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
int index_,long argl, void *argp) int idx,long argl, void *argp)
{ {
if(!p_surewarehk_Free) if(!p_surewarehk_Free)
{ {

2
crypto/ripemd/rmdtest.c
View file

@ -59,6 +59,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <openssl/ripemd.h>
#ifdef OPENSSL_NO_RIPEMD #ifdef OPENSSL_NO_RIPEMD
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -67,7 +68,6 @@ int main(int argc, char *argv[])
return(0); return(0);
} }
#else #else
#include <openssl/ripemd.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#ifdef CHARSET_EBCDIC #ifdef CHARSET_EBCDIC