diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/cert_database_nss.cc | 4 | ||||
| -rw-r--r-- | net/base/ev_root_ca_metadata.cc | 4 | ||||
| -rw-r--r-- | net/base/keygen_handler_nss.cc | 4 | ||||
| -rw-r--r-- | net/ocsp/nss_ocsp.cc | 4 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 4 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_nss.h | 4 | ||||
| -rw-r--r-- | net/socket/ssl_test_util.cc | 4 |
7 files changed, 0 insertions, 28 deletions
diff --git a/net/base/cert_database_nss.cc b/net/base/cert_database_nss.cc index 5f43fef..605c556 100644 --- a/net/base/cert_database_nss.cc +++ b/net/base/cert_database_nss.cc @@ -4,9 +4,6 @@ #include "net/base/cert_database.h" -// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 -// until NSS 3.12.2 comes out and we update to it. -#define Lock FOO_NSS_Lock #include <pk11pub.h> #include <secmod.h> #include <ssl.h> @@ -14,7 +11,6 @@ #include <secder.h> // DER_Encode() #include <cryptohi.h> // SEC_DerSignData() #include <keyhi.h> // SECKEY_CreateSubjectPublicKeyInfo() -#undef Lock #include "base/logging.h" #include "base/scoped_ptr.h" diff --git a/net/base/ev_root_ca_metadata.cc b/net/base/ev_root_ca_metadata.cc index 5461108..e2200fe 100644 --- a/net/base/ev_root_ca_metadata.cc +++ b/net/base/ev_root_ca_metadata.cc @@ -5,14 +5,10 @@ #include "net/base/ev_root_ca_metadata.h" #if defined(OS_LINUX) -// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 -// until NSS 3.12.2 comes out and we update to it. -#define Lock FOO_NSS_Lock #include <cert.h> #include <pkcs11n.h> #include <secerr.h> #include <secoid.h> -#undef Lock #endif #include "base/logging.h" diff --git a/net/base/keygen_handler_nss.cc b/net/base/keygen_handler_nss.cc index 9707dfc..2610d7f 100644 --- a/net/base/keygen_handler_nss.cc +++ b/net/base/keygen_handler_nss.cc @@ -4,9 +4,6 @@ #include "net/base/keygen_handler.h" -// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 -// until NSS 3.12.2 comes out and we update to it. -#define Lock FOO_NSS_Lock #include <pk11pub.h> #include <secmod.h> #include <ssl.h> @@ -14,7 +11,6 @@ #include <secder.h> // DER_Encode() #include <cryptohi.h> // SEC_DerSignData() #include <keyhi.h> // SECKEY_CreateSubjectPublicKeyInfo() -#undef Lock #include "base/nss_init.h" #include "base/logging.h" diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index 85fc5f5..8ee1e96 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -4,11 +4,7 @@ #include "net/ocsp/nss_ocsp.h" -// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 -// until NSS 3.12.2 comes out and we update to it. -#define Lock FOO_NSS_Lock #include <certt.h> -#undef Lock #include <certdb.h> #include <ocsp.h> #include <nspr.h> diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index f6cd614..19832ad 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -52,13 +52,9 @@ #include <nspr.h> #include <nss.h> #include <secerr.h> -// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 -// until NSS 3.12.2 comes out and we update to it. -#define Lock FOO_NSS_Lock #include <ssl.h> #include <sslerr.h> #include <pk11pub.h> -#undef Lock #include "base/compiler_specific.h" #include "base/logging.h" diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index 6e871b5..73e6c8c 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.h @@ -5,11 +5,7 @@ #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ -// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 -// until NSS 3.12.2 comes out and we update to it. -#define Lock FOO_NSS_Lock #include <certt.h> -#undef Lock #include <keyt.h> #include <nspr.h> #include <nss.h> diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc index a58863e..d00b89d 100644 --- a/net/socket/ssl_test_util.cc +++ b/net/socket/ssl_test_util.cc @@ -16,13 +16,9 @@ #include <nspr.h> #include <nss.h> #include <secerr.h> -// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 -// until NSS 3.12.2 comes out and we update to it. -#define Lock FOO_NSS_Lock #include <ssl.h> #include <sslerr.h> #include <pk11pub.h> -#undef Lock #include "base/nss_init.h" #elif defined(OS_MACOSX) #include <Security/Security.h> |