resolve conflicts

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/libcrypto/err/openssl.ec b/src/lib/libcrypto/err/openssl.ec
index f8cd6937e7..1938f081ac 100644
--- a/src/lib/libcrypto/err/openssl.ec
+++ b/src/lib/libcrypto/err/openssl.ec
@@ -27,11 +27,16 @@ 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-1.0/fips.h                 fips-1.0/fips_err.h
+L COMP          crypto/comp/comp.h              crypto/comp/comp_err.c
+L ECDSA         crypto/ecdsa/ecdsa.h            crypto/ecdsa/ecs_err.c
+L ECDH          crypto/ecdh/ecdh.h              crypto/ecdh/ech_err.c
+L STORE         crypto/store/store.h            crypto/store/str_err.c
+L CMS           crypto/cms/cms.h                crypto/cms/cms_err.c
 
 # additional header files to be scanned for function names
 L NONE          crypto/x509/x509_vfy.h          NONE
 L NONE          crypto/ec/ec_lcl.h              NONE
+L NONE          crypto/cms/cms_lcl.h            NONE
 
 
 F RSAREF_F_RSA_BN2BIN