Actually, only firefox35 bundles its own nss for some reason, so revert
previous. No pkg change, no bump.
This commit is contained in:
parent
65c1fde171
commit
224f5fbb96
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-security_nss_lib_freebl_blapi_h,v 1.1 2009/11/17 23:08:12 ajacoutot Exp $
|
||||
|
||||
SHA1_Update conflicts with openssl which may be dynamically loaded
|
||||
at runtime via libcups or libgssapi so causing a crash due to using
|
||||
the wrong binding. So rename here to avoid conflict.
|
||||
|
||||
--- security/nss/lib/freebl/blapi.h.orig Mon Nov 16 13:56:20 2009
|
||||
+++ security/nss/lib/freebl/blapi.h Mon Nov 16 13:56:34 2009
|
||||
@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
|
||||
*/
|
||||
extern void SHA1_Begin(SHA1Context *cx);
|
||||
|
||||
+#define SHA1_Update NSS_SHA1_Update
|
||||
+
|
||||
/*
|
||||
** Update the SHA-1 hash function with more data.
|
||||
** "cx" the context
|
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-security_nss_lib_freebl_blapi_h,v 1.1 2009/11/17 23:07:45 ajacoutot Exp $
|
||||
|
||||
SHA1_Update conflicts with openssl which may be dynamically loaded
|
||||
at runtime via libcups or libgssapi so causing a crash due to using
|
||||
the wrong binding. So rename here to avoid conflict.
|
||||
|
||||
--- security/nss/lib/freebl/blapi.h.orig Mon Nov 16 14:01:55 2009
|
||||
+++ security/nss/lib/freebl/blapi.h Mon Nov 16 14:02:09 2009
|
||||
@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
|
||||
*/
|
||||
extern void SHA1_Begin(SHA1Context *cx);
|
||||
|
||||
+#define SHA1_Update NSS_SHA1_Update
|
||||
+
|
||||
/*
|
||||
** Update the SHA-1 hash function with more data.
|
||||
** "cx" the context
|
Loading…
Reference in New Issue
Block a user