diff options
| author | wtc%google.com <devnull@localhost> | 2008-10-03 19:40:51 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2008-10-03 19:40:51 +0000 |
| commit | 5f7a96c70bb53463a65eaa0fbaf273ece0a4c7b2 (patch) | |
| tree | 2887f71386f587d4cc2a7f311aec4a1993ae7baf | |
| parent | 553a3bc99cce634bc6428feaada2f876443aba22 (diff) | |
| download | nss-hg-5f7a96c70bb53463a65eaa0fbaf273ece0a4c7b2.tar.gz | |
Bug 438870: Don't use PL_strlen in lib/freebl. Don't link with -lplc4 and
-lplds4, which are not needed to resolve any symbols. r=rrelyea,nelson.
Modified Files:
config.mk md2.c md5.c
| -rw-r--r-- | security/nss/lib/freebl/config.mk | 10 | ||||
| -rw-r--r-- | security/nss/lib/freebl/md2.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/freebl/md5.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/security/nss/lib/freebl/config.mk b/security/nss/lib/freebl/config.mk index 68012cabf..dc2797ea0 100644 --- a/security/nss/lib/freebl/config.mk +++ b/security/nss/lib/freebl/config.mk @@ -90,15 +90,11 @@ EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ -lnssutil3 \ -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ -lnspr4 \ $(NULL) else # ! NS_USE_GCC EXTRA_SHARED_LIBS += \ $(DIST)/lib/nssutil3.lib \ - $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \ - $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \ $(NULL) endif # NS_USE_GCC @@ -109,11 +105,13 @@ EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ -lnssutil3 \ -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ -lnspr4 \ $(NULL) endif +ifeq ($(OS_ARCH), Darwin) +EXTRA_SHARED_LIBS += -dylib_file @executable_path/libplc4.dylib:$(DIST)/lib/libplc4.dylib -dylib_file @executable_path/libplds4.dylib:$(DIST)/lib/libplds4.dylib +endif + endif diff --git a/security/nss/lib/freebl/md2.c b/security/nss/lib/freebl/md2.c index ddc7a9d7e..8582f903e 100644 --- a/security/nss/lib/freebl/md2.c +++ b/security/nss/lib/freebl/md2.c @@ -100,7 +100,7 @@ MD2_Hash(unsigned char *dest, const char *src) return SECFailure; } MD2_Begin(cx); - MD2_Update(cx, (unsigned char *)src, PL_strlen(src)); + MD2_Update(cx, (const unsigned char *)src, PORT_Strlen(src)); MD2_End(cx, dest, &len, MD2_DIGEST_LEN); MD2_DestroyContext(cx, PR_TRUE); return SECSuccess; diff --git a/security/nss/lib/freebl/md5.c b/security/nss/lib/freebl/md5.c index fbcee7f46..97c400d9c 100644 --- a/security/nss/lib/freebl/md5.c +++ b/security/nss/lib/freebl/md5.c @@ -222,7 +222,7 @@ struct MD5ContextStr { SECStatus MD5_Hash(unsigned char *dest, const char *src) { - return MD5_HashBuf(dest, (unsigned char *)src, PL_strlen(src)); + return MD5_HashBuf(dest, (const unsigned char *)src, PORT_Strlen(src)); } SECStatus |