From 4a620922e243fae11fe3702c4183a80592b03701 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 15 Jul 2009 18:00:04 +0000 Subject: [PATCH] Updates from 1.0.0-stable --- crypto/dso/dso_dlfcn.c | 17 +++++++++++++---- test/Makefile | 6 +++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index 168c25b9e8..06953f3bd5 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -351,6 +351,15 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1, return(merged); } +#ifdef OPENSSL_SYS_MAC +#define DSO_ext ".dynlib" +#define DSO_extlen 7 +#else +#define DSO_ext ".so" +#define DSO_extlen 3 +#endif + + static char *dlfcn_name_converter(DSO *dso, const char *filename) { char *translated; @@ -361,8 +370,8 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename) transform = (strstr(filename, "/") == NULL); if(transform) { - /* We will convert this to "%s.so" or "lib%s.so" */ - rsize += 3; /* The length of ".so" */ + /* We will convert this to "%s.so" or "lib%s.so" etc */ + rsize += DSO_extlen; /* The length of ".so" */ if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0) rsize += 3; /* The length of "lib" */ } @@ -376,9 +385,9 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename) if(transform) { if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0) - sprintf(translated, "lib%s.so", filename); + sprintf(translated, "lib%s" DSO_ext, filename); else - sprintf(translated, "%s.so", filename); + sprintf(translated, "%s" DSO_ext, filename); } else sprintf(translated, "%s", filename); diff --git a/test/Makefile b/test/Makefile index 54cd727fba..bbd7539187 100644 --- a/test/Makefile +++ b/test/Makefile @@ -134,7 +134,7 @@ alltests: \ test_enc test_x509 test_rsa test_crl test_sid \ test_gen test_req test_pkcs7 test_verify test_dh test_dsa \ test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \ - test_jpake + test_jpake test_cms test_evp: ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt @@ -304,6 +304,10 @@ test_jpake: $(JPAKETEST)$(EXE_EXT) @echo "Test JPAKE" ../util/shlib_wrap.sh ./$(JPAKETEST) +test_cms: + @echo "CMS consistency test" + $(PERL) cms-test.pl + lint: lint -DLINT $(INCLUDES) $(SRC)>fluff -- GitLab