2 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index c78790a54c..53687d79ab 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -621,7 +621,8 @@ static void err_load_strings(int lib, ERR_STRING_DATA *str)
         {
         while (str->error)
                 {
-                str->error|=ERR_PACK(lib,0,0);
+                if (lib)
+                        str->error|=ERR_PACK(lib,0,0);
                 ERRFN(err_set_item)(str);
                 str++;
                 }
@@ -637,7 +638,8 @@ void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
         {
         while (str->error)
                 {
-                str->error|=ERR_PACK(lib,0,0);
+                if (lib)
+                        str->error|=ERR_PACK(lib,0,0);
                 ERRFN(err_del_item)(str);
                 str++;
                 }
diff --git a/src/lib/libcrypto/err/openssl.ec b/src/lib/libcrypto/err/openssl.ec
index 447a7f87ed..f8cd6937e7 100644
--- a/src/lib/libcrypto/err/openssl.ec
+++ b/src/lib/libcrypto/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.h
+L FIPS          fips-1.0/fips.h                 fips-1.0/fips_err.h
 
 # additional header files to be scanned for function names
 L NONE          crypto/x509/x509_vfy.h          NONE