Change the source and output paths for 'chil' and '4758cca' engines so that

dynamic loading is consistent with respect to engine ids.

diff --git a/CHANGES b/CHANGES
index 3b68628fb206a440b9d7555ce14bec1bc493cf17..76406f27a1dadbb9dd48b54bded72d82da824f47 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,13 @@
 
  Changes between 0.9.7h and 0.9.8  [xx XXX xxxx]
 
+  *) Correct naming of the 'chil' and '4758cca' ENGINEs. This
+     involves renaming the source and generated shared-libs for
+     both. The engines will accept the corrected or legacy ids
+     ('ncipher' and '4758_cca' respectively) when binding. NB,
+     this only applies when building 'shared'.
+     [Corinna Vinschen <vinschen@redhat.com> and Geoff Thorpe]
+
   *) Add attribute functions to EVP_PKEY structure. Modify
      PKCS12_create() to recognize a CSP name attribute and
      use it. Make -CSP option work again in pkcs12 utility.

diff --git a/engines/Makefile b/engines/Makefile
index bf19edfe0b64fc0c9fce0e8a1b4022b23bbb837d..bb338258de6ec779a1da5220edff7ad21b59709b 100644 (file)
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -20,23 +20,23 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBNAMES= 4758_cca aep atalla cswift gmp ncipher nuron sureware ubsec
+LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec
 
-LIBSRC=        e_4758_cca.c \
+LIBSRC=        e_4758cca.c \
        e_aep.c \
        e_atalla.c \
        e_cswift.c \
        e_gmp.c \
-       e_ncipher.c \
+       e_chil.c \
        e_nuron.c \
        e_sureware.c \
        e_ubsec.c
-LIBOBJ= e_4758_cca.o \
+LIBOBJ= e_4758cca.o \
        e_aep.o \
        e_atalla.o \
        e_cswift.o \
        e_gmp.o \
-       e_ncipher.o \
+       e_chil.o \
        e_nuron.o \
        e_sureware.o \
        e_ubsec.o
@@ -44,12 +44,12 @@ LIBOBJ= e_4758_cca.o \
 SRC= $(LIBSRC)
 
 EXHEADER= 
-HEADER=        e_4758_cca_err.c e_4758_cca_err.h \
+HEADER=        e_4758cca_err.c e_4758cca_err.h \
        e_aep_err.c e_aep_err.h \
        e_atalla_err.c e_atalla_err.h \
        e_cswift_err.c e_cswift_err.h \
        e_gmp_err.c e_gmp_err.h \
-       e_ncipher_err.c e_ncipher_err.h \
+       e_chil_err.c e_chil_err.h \
        e_nuron_err.c e_nuron_err.h \
        e_sureware_err.c e_sureware_err.h \
        e_ubsec_err.c e_ubsec_err.h
@@ -130,22 +130,22 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-e_4758_cca.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-e_4758_cca.o: ../include/openssl/bn.h ../include/openssl/buffer.h
-e_4758_cca.o: ../include/openssl/crypto.h ../include/openssl/dso.h
-e_4758_cca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-e_4758_cca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-e_4758_cca.o: ../include/openssl/engine.h ../include/openssl/err.h
-e_4758_cca.o: ../include/openssl/evp.h ../include/openssl/lhash.h
-e_4758_cca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-e_4758_cca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-e_4758_cca.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
-e_4758_cca.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-e_4758_cca.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-e_4758_cca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-e_4758_cca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-e_4758_cca.o: e_4758_cca.c e_4758_cca_err.c e_4758_cca_err.h
-e_4758_cca.o: vendor_defns/hw_4758_cca.h
+e_4758cca.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_4758cca.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_4758cca.o: ../include/openssl/crypto.h ../include/openssl/dso.h
+e_4758cca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+e_4758cca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+e_4758cca.o: ../include/openssl/engine.h ../include/openssl/err.h
+e_4758cca.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+e_4758cca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+e_4758cca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_4758cca.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
+e_4758cca.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+e_4758cca.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+e_4758cca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+e_4758cca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+e_4758cca.o: e_4758cca.c e_4758cca_err.c e_4758cca_err.h
+e_4758cca.o: vendor_defns/hw_4758_cca.h
 e_aep.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 e_aep.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 e_aep.o: ../include/openssl/crypto.h ../include/openssl/dh.h
@@ -184,24 +184,24 @@ e_gmp.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
 e_gmp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 e_gmp.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 e_gmp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h e_gmp.c
-e_ncipher.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-e_ncipher.o: ../include/openssl/bn.h ../include/openssl/buffer.h
-e_ncipher.o: ../include/openssl/crypto.h ../include/openssl/dh.h
-e_ncipher.o: ../include/openssl/dso.h ../include/openssl/e_os2.h
-e_ncipher.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-e_ncipher.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-e_ncipher.o: ../include/openssl/err.h ../include/openssl/evp.h
-e_ncipher.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-e_ncipher.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-e_ncipher.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-e_ncipher.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-e_ncipher.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-e_ncipher.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-e_ncipher.o: ../include/openssl/sha.h ../include/openssl/stack.h
-e_ncipher.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
-e_ncipher.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-e_ncipher.o: e_ncipher.c e_ncipher_err.c e_ncipher_err.h
-e_ncipher.o: vendor_defns/hwcryptohook.h
+e_chil.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_chil.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_chil.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_chil.o: ../include/openssl/dso.h ../include/openssl/e_os2.h
+e_chil.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+e_chil.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
+e_chil.o: ../include/openssl/err.h ../include/openssl/evp.h
+e_chil.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+e_chil.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+e_chil.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+e_chil.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+e_chil.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+e_chil.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+e_chil.o: ../include/openssl/sha.h ../include/openssl/stack.h
+e_chil.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+e_chil.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+e_chil.o: e_chil.c e_chil_err.c e_chil_err.h
+e_chil.o: vendor_defns/hwcryptohook.h
 e_nuron.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 e_nuron.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 e_nuron.o: ../include/openssl/crypto.h ../include/openssl/dh.h

diff --git a/engines/e_4758_cca.ec b/engines/e_4758_cca.ec
deleted file mode 100644 (file)
index 2919969..0000000
--- a/engines/e_4758_cca.ec
+++ /dev/null
@@ -1 +0,0 @@
-L CCA4758      e_4758_cca_err.h                e_4758_cca_err.c

diff --git a/engines/e_4758_cca.c b/engines/e_4758cca.c
similarity index 99%
rename from engines/e_4758_cca.c
rename to engines/e_4758cca.c
index d01a037835d85e24ad505048364b37629085612f..e7f308e31403d54da6736df933a139676836350a 100644 (file)
--- a/engines/e_4758_cca.c
+++ b/engines/e_4758cca.c
@@ -73,7 +73,7 @@
 #include "vendor_defns/hw_4758_cca.h"
 #endif
 
-#include "e_4758_cca_err.c"
+#include "e_4758cca_err.c"
 
 static int ibm_4758_cca_destroy(ENGINE *e);
 static int ibm_4758_cca_init(ENGINE *e);

diff --git a/engines/e_4758cca.ec b/engines/e_4758cca.ec
new file mode 100644 (file)
index 0000000..f30ed02
--- /dev/null
+++ b/engines/e_4758cca.ec
@@ -0,0 +1 @@
+L CCA4758      e_4758cca_err.h         e_4758cca_err.c

diff --git a/engines/e_4758_cca_err.c b/engines/e_4758cca_err.c
similarity index 99%
rename from engines/e_4758_cca_err.c
rename to engines/e_4758cca_err.c
index 5d26450fe1d3c3bfd3264c5040b504e786a98334..6ecdc6e62781575f51ef60d568451a7aa483454b 100644 (file)
--- a/engines/e_4758_cca_err.c
+++ b/engines/e_4758cca_err.c
@@ -1,4 +1,4 @@
-/* e_4758_cca_err.c */
+/* e_4758cca_err.c */
 /* ====================================================================
  * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "e_4758_cca_err.h"
+#include "e_4758cca_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR

diff --git a/engines/e_4758_cca_err.h b/engines/e_4758cca_err.h
similarity index 100%
rename from engines/e_4758_cca_err.h
rename to engines/e_4758cca_err.h

diff --git a/engines/e_ncipher.c b/engines/e_chil.c
similarity index 99%
rename from engines/e_ncipher.c
rename to engines/e_chil.c
index 11ae5aec821cd8c6f14fb02b8f9641c716b8ddcb..14654a783325190f55090b4b997537927bab5c8f 100644 (file)
--- a/engines/e_ncipher.c
+++ b/engines/e_chil.c
@@ -87,7 +87,7 @@
 #endif
 
 #define HWCRHK_LIB_NAME "hwcrhk engine"
-#include "e_ncipher_err.c"
+#include "e_chil_err.c"
 
 static int hwcrhk_destroy(ENGINE *e);
 static int hwcrhk_init(ENGINE *e);

diff --git a/engines/e_chil.ec b/engines/e_chil.ec
new file mode 100644 (file)
index 0000000..b5a76e1
--- /dev/null
+++ b/engines/e_chil.ec
@@ -0,0 +1 @@
+L HWCRHK       e_chil_err.h                    e_chil_err.c

diff --git a/engines/e_ncipher_err.c b/engines/e_chil_err.c
similarity index 99%
rename from engines/e_ncipher_err.c
rename to engines/e_chil_err.c
index b219a88616afc42fcb16bdb46adb1ea0aafd1df3..3fec95a272bbf3e30e0fb3e02da508ab99e99383 100644 (file)
--- a/engines/e_ncipher_err.c
+++ b/engines/e_chil_err.c
@@ -1,4 +1,4 @@
-/* e_ncipher_err.c */
+/* e_chil_err.c */
 /* ====================================================================
  * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "e_ncipher_err.h"
+#include "e_chil_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR

diff --git a/engines/e_ncipher_err.h b/engines/e_chil_err.h
similarity index 100%
rename from engines/e_ncipher_err.h
rename to engines/e_chil_err.h

diff --git a/engines/e_ncipher.ec b/engines/e_ncipher.ec
deleted file mode 100644 (file)
index 561db41..0000000
--- a/engines/e_ncipher.ec
+++ /dev/null
@@ -1 +0,0 @@
-L HWCRHK       e_ncipher_err.h                 e_ncipher_err.c

diff --git a/engines/makeengines.com b/engines/makeengines.com
index 2191a2242d7779ee4f49388d4d307039947f3c93..4a7474e01071251305192f9a970ae61f9f3f1fa0 100644 (file)
--- a/engines/makeengines.com
+++ b/engines/makeengines.com
@@ -34,7 +34,7 @@ $! Set the names of the engines we want to build
 $!
 $ ENGINES = "," + P6
 $ IF ENGINES .EQS. "," THEN -
-       ENGINES = ",4758_cca,aep,atalla,cswift,ncipher,nuron,sureware,ubsec"
+       ENGINES = ",4758cca,aep,atalla,cswift,chil,nuron,sureware,ubsec"
 $!
 $! Set the default TCP/IP library to link against if needed
 $!
@@ -79,11 +79,11 @@ $ THEN
 $   ENGINE_ = "engine_vector.mar"
 $   EXTRA_OBJ := ,'OBJ_DIR'ENGINE_VECTOR.OBJ
 $ ENDIF
-$ ENGINE_4758_CCA = "e_4758_cca"
+$ ENGINE_4758CCA = "e_4758cca"
 $ ENGINE_aep = "e_aep"
 $ ENGINE_atalla = "e_atalla"
 $ ENGINE_cswift = "e_cswift"
-$ ENGINE_ncipher = "e_ncipher"
+$ ENGINE_chil = "e_chil"
 $ ENGINE_nuron = "e_nuron"
 $ ENGINE_sureware = "e_sureware"
 $ ENGINE_ubsec = "e_ubsec"