Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Unified Diff: net/third_party/nss/patches/fixpk11symbollookup.patch

Issue 962593002: Use dlsym(RTLD_DEFAULT) instead of dlsym(dlopen(NULL)) in aesgcmchromium.patch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Ryan's comments. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/third_party/nss/patches/fixpk11symbollookup.patch
diff --git a/net/third_party/nss/patches/fixpk11symbollookup.patch b/net/third_party/nss/patches/fixpk11symbollookup.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9aa025e9bb09c1750397a58f17315ed9f4d57fb5
--- /dev/null
+++ b/net/third_party/nss/patches/fixpk11symbollookup.patch
@@ -0,0 +1,32 @@
+diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c
+index ffb757a..91a1f1e 100644
+--- a/net/third_party/nss/ssl/ssl3con.c
++++ b/net/third_party/nss/ssl/ssl3con.c
+@@ -8,6 +8,7 @@
+
+ /* TODO(ekr): Implement HelloVerifyRequest on server side. OK for now. */
+
++#define _GNU_SOURCE 1
+ #include "cert.h"
+ #include "ssl.h"
+ #include "cryptohi.h" /* for DSAU_ stuff */
+@@ -1884,14 +1885,8 @@ ssl3_ResolvePK11CryptFunctions(void)
+ #ifdef LINUX
+ /* On Linux we use the system NSS libraries. Look up the PK11_Encrypt and
+ * PK11_Decrypt functions at run time. */
+- void *handle = dlopen(NULL, RTLD_LAZY);
+- if (!handle) {
+- PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
+- return PR_FAILURE;
+- }
+- pk11_encrypt = (PK11CryptFcn)dlsym(handle, "PK11_Encrypt");
+- pk11_decrypt = (PK11CryptFcn)dlsym(handle, "PK11_Decrypt");
+- dlclose(handle);
++ pk11_encrypt = (PK11CryptFcn)dlsym(RTLD_DEFAULT, "PK11_Encrypt");
++ pk11_decrypt = (PK11CryptFcn)dlsym(RTLD_DEFAULT, "PK11_Decrypt");
+ return PR_SUCCESS;
+ #else
+ /* On other platforms we use our own copy of NSS. PK11_Encrypt and
+--
+2.2.0.rc0.207.ga3a616c
+

Powered by Google App Engine
This is Rietveld 408576698