Since fips_err is really just used as a header by fips_err_wrapper.c,

let's change it's suffix from .c to .h.  This also avoids some
otherwise very mysterious (and probably sensible from a historical
point of view :-)) name changes done by mk1mf.pl.

diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 378fbb9242fb956be07bca7ad011cd71f7249508..447a7f87ed8328730e7eafed245cdf4a21e4d758 100644 (file)
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -27,7 +27,7 @@ L DSO         crypto/dso/dso.h                crypto/dso/dso_err.c
 L ENGINE       crypto/engine/engine.h          crypto/engine/eng_err.c
 L OCSP         crypto/ocsp/ocsp.h              crypto/ocsp/ocsp_err.c
 L UI           crypto/ui/ui.h                  crypto/ui/ui_err.c
-L FIPS         fips/fips.h                     fips/fips_err.c
+L FIPS         fips/fips.h                     fips/fips_err.h
 
 # additional header files to be scanned for function names
 L NONE         crypto/x509/x509_vfy.h          NONE

diff --git a/fips/Makefile.ssl b/fips/Makefile.ssl
index cf2fe39c93d5f2bcdbb4c9f65f007527bfbbe87a..eca8fc8a752bd6f0947e58ec12900eb20d8f9bd5 100644 (file)
--- a/fips/Makefile.ssl
+++ b/fips/Makefile.ssl
@@ -32,13 +32,13 @@ GENERAL=Makefile README fips-lib.com install.com
 
 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= libcrypto$(SHLIB_EXT)
-LIBSRC=fips.c fips_err_wrapper.c fips_err.c
-LIBOBJ=fips.o fips_err_wrapper.o fips_err.o
+LIBSRC=fips.c fips_err_wrapper.c
+LIBOBJ=fips.o fips_err_wrapper.o
 
 SRC= $(LIBSRC)
 
 EXHEADER=fips.h
-HEADER=$(EXHEADER)
+HEADER=$(EXHEADER) fips_err.h
 EXE=openssl_fips_fingerprint
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)

diff --git a/fips/fips_err.c b/fips/fips_err.h
similarity index 100%
rename from fips/fips_err.c
rename to fips/fips_err.h

diff --git a/fips/fips_err_wrapper.c b/fips/fips_err_wrapper.c
index 782f823424412b65b4746ad121e7331fc03ebcd5..f849ca7c943f9958163d4fdc9a3fe87dc1b740f2 100644 (file)
--- a/fips/fips_err_wrapper.c
+++ b/fips/fips_err_wrapper.c
@@ -1,5 +1,5 @@
 #ifdef FIPS
-# include "fips_err.c"
+# include "fips_err.h"
 #else
 static void *dummy=&dummy;
 #endif