Commit 3114aa36 authored by Michael Spang's avatar Michael Spang Committed by Commit Bot

instrumented_libraries: Fix nss patch

This patch is corrupt:

patch: **** malformed patch at line 54:          return PR_FALSE;

Bug: 1027853

Change-Id: I8cee1172c2dbd5abe28f65c648df343a0c91d882
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1937464Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719489}
parent f3d77ceb
......@@ -31,24 +31,24 @@ diff -rupN ./nss/lib/freebl/Makefile ../nss-3.17.1-patched/nss/lib/freebl/Makefi
es
--- ./nss/lib/sysinit/nsssysinit.c 2019-10-23 01:27:12.205366237 +0000
+++ ../nss-3.17.1-patched/nss/lib/sysinit/nsssysinit.c 2019-10-23 01:26:49.045359974 +0000
@@ -42,7 +42,9 @@ testdir(char *dir)
@@ -42,7 +42,9 @@
static char *
getUserDB(void)
{
- char *userdir = PR_GetEnvSecure("HOME");
+ # Prevent nss from trying to pull in PR_GetEnvSecure from libnspr4, which
+ # the latter library doesn't seem to export.
+ // Prevent nss from trying to pull in PR_GetEnvSecure from libnspr4, which
+ // the latter library doesn't seem to export.
+ char *userdir = secure_getenv("HOME");
char *nssdir = NULL;
if (userdir == NULL) {
@@ -134,7 +134,7 @@ userCanModifySystemDB()
@@ -134,7 +136,9 @@
static PRBool
getFIPSEnv(void)
{
- char *fipsEnv = PR_GetEnvSecure("NSS_FIPS");
+ # Prevent nss from trying to pull in PR_GetEnvSecure from libnspr4, which
+ # the latter library doesn't seem to export.
+ // Prevent nss from trying to pull in PR_GetEnvSecure from libnspr4, which
+ // the latter library doesn't seem to export.
+ char *fipsEnv = secure_getenv("NSS_FIPS");
if (!fipsEnv) {
return PR_FALSE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment