generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updates from 1.0.0-stable

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-07-15 18:00:04 +00:00
parent 4b06d778ad
commit 4a620922e2
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crypto/dso/dso_dlfcn.c
View File

@ -351,6 +351,15 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1,
return(merged); 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) static char *dlfcn_name_converter(DSO *dso, const char *filename)
{ {
char *translated; char *translated;
@ -361,8 +370,8 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
transform = (strstr(filename, "/") == NULL); transform = (strstr(filename, "/") == NULL);
if(transform) if(transform)
{ {
/* We will convert this to "%s.so" or "lib%s.so" */ /* We will convert this to "%s.so" or "lib%s.so" etc */
rsize += 3; /* The length of ".so" */ rsize += DSO_extlen; /* The length of ".so" */
if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0) if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
rsize += 3; /* The length of "lib" */ rsize += 3; /* The length of "lib" */
} }
@ -376,9 +385,9 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
if(transform) if(transform)
{ {
if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0) 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 else
sprintf(translated, "%s.so", filename); sprintf(translated, "%s" DSO_ext, filename);
} }
else else
sprintf(translated, "%s", filename); sprintf(translated, "%s", filename);

6
test/Makefile
View File

@ -134,7 +134,7 @@ alltests: \
test_enc test_x509 test_rsa test_crl test_sid \ test_enc test_x509 test_rsa test_crl test_sid \
test_gen test_req test_pkcs7 test_verify test_dh test_dsa \ 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_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \
test_jpake test_jpake test_cms
test_evp: test_evp:
../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
@ -304,6 +304,10 @@ test_jpake: $(JPAKETEST)$(EXE_EXT)
@echo "Test JPAKE" @echo "Test JPAKE"
../util/shlib_wrap.sh ./$(JPAKETEST) ../util/shlib_wrap.sh ./$(JPAKETEST)
test_cms:
@echo "CMS consistency test"
$(PERL) cms-test.pl
lint: lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff lint -DLINT $(INCLUDES) $(SRC)>fluff