Commit 92d1bc09 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

This adds a new ENGINE to support IBM 4758 cards, contributed by Maurice 

Gittens.
parent d62bfb39

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ 
         *) applies to 0.9.6a ... 0.9.6d and 0.9.7

         +) applies to 0.9.7 only



  +) Added the '4758cca' ENGINE to support IBM 4758 cards.

     [Maurice Gittens <maurice@gittens.nl>, touchups by Geoff Thorpe]



  *) Fix bug in SSL_clear(): bad sessions were not removed (found by

     Yoram Zahavi <YoramZ@gilian.com>).

     [Lutz Jaenicke]

crypto/engine/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \ 
	tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_rand.c tb_cipher.c tb_digest.c \

	eng_openssl.c eng_dyn.c eng_cnf.c \

	hw_atalla.c hw_cswift.c hw_ncipher.c hw_nuron.c hw_ubsec.c \

	hw_openbsd_dev_crypto.c hw_aep.c hw_sureware.c

	hw_openbsd_dev_crypto.c hw_aep.c hw_sureware.c hw_4758_cca.c

LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \

	eng_table.o eng_pkey.o eng_fat.o eng_all.o \

	tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_rand.o tb_cipher.o tb_digest.o \

	eng_openssl.o eng_dyn.o eng_cnf.o \

	hw_atalla.o hw_cswift.o hw_ncipher.o hw_nuron.o hw_ubsec.o \

	hw_openbsd_dev_crypto.o hw_aep.o hw_sureware.o

	hw_openbsd_dev_crypto.o hw_aep.o hw_sureware.o hw_4758_cca.o



SRC= $(LIBSRC)

crypto/engine/eng_all.c

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ void ENGINE_load_builtin_engines(void) 
#ifndef OPENSSL_NO_HW_SUREWARE

	ENGINE_load_sureware();

#endif

#ifndef OPENSSL_NO_HW_4758_CCA

	ENGINE_load_4758cca();

#endif

#ifdef OPENSSL_OPENBSD_DEV_CRYPTO

	ENGINE_load_openbsd_dev_crypto();

#endif

crypto/engine/engine.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ void ENGINE_load_nuron(void); 
void ENGINE_load_ubsec(void);

void ENGINE_load_aep(void);

void ENGINE_load_sureware(void);

void ENGINE_load_4758cca(void);

void ENGINE_load_openbsd_dev_crypto(void);

void ENGINE_load_builtin_engines(void);

crypto/engine/hw.ec

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ L HWCRHK hw_ncipher_err.h hw_ncipher_err.c 
L NURON		hw_nuron_err.h			hw_nuron_err.c

L SUREWARE	hw_sureware_err.h		hw_sureware_err.c

L UBSEC		hw_ubsec_err.h			hw_ubsec_err.c

L CCA4758	hw_4758_cca_err.h		hw_4758_cca_err.c