Drop library renaming & symlinking as the SONAME is the plain .so file. Simplify the PRELINK setup. Fix a build warning with the fipstest code.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

1 files changed, 26 insertions, 0 deletions

diff --git a/dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch b/dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch
new file mode 100644
index 000000000000..cf2fd8652a9d
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch
@@ -0,0 +1,26 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=920899
+
+diff -r 279078670022 security/nss/cmd/fipstest/fipstest.c
+--- a/security/nss/cmd/fipstest/fipstest.c	Wed Mar 27 17:03:34 2013 -0400
++++ b/security/nss/cmd/fipstest/fipstest.c	Thu Sep 26 00:58:04 2013 -0400
+@@ -3616,10 +3616,10 @@ void hmac_test(char *reqfn)
+         goto loser;
+     }      
+     msg = PORT_ZAlloc(msgLen);
+-    memset(msg, 0, msgLen);
+     if (msg == NULL) {
+         goto loser;
+     } 
++    memset(msg, 0, msgLen);
+ 
+     req = fopen(reqfn, "r");
+     resp = stdout;
+@@ -3677,7 +3677,7 @@ void hmac_test(char *reqfn)
+             keyLen = 0; 
+             TLen = 0;
+             memset(key, 0, sizeof key);     
+-            memset(msg, 0, sizeof msg);  
++            memset(msg, 0, msgLen);
+             memset(HMAC, 0, sizeof HMAC);
+             continue;
+         }