summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 00:32:10 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 00:32:10 +0000
commitc2a4c3d9954148e090332e29a2d88f64dffe9a3a (patch)
tree6b2449ec85d35e7ac9aab8c539536c8199c473e7 /net/http
parente09cfd8679ef12b16e17a1d246a1057d24c6132c (diff)
downloadchromium_src-c2a4c3d9954148e090332e29a2d88f64dffe9a3a.zip
chromium_src-c2a4c3d9954148e090332e29a2d88f64dffe9a3a.tar.gz
chromium_src-c2a4c3d9954148e090332e29a2d88f64dffe9a3a.tar.bz2
Use the USE_NSS macro to help porting to FreeBSD, OpenBSD, etc.
Fix cpplint nits. R=evan,pvalchev BUG=none TEST=No compilation errors. Review URL: http://codereview.chromium.org/558008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/des.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http/des.cc b/net/http/des.cc
index 9e56a70..0ca12b9 100644
--- a/net/http/des.cc
+++ b/net/http/des.cc
@@ -4,7 +4,7 @@
#include "net/http/des.h"
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
#include <nss.h>
#include <pk11pub.h>
#elif defined(OS_MACOSX)
@@ -15,7 +15,7 @@
#endif
#include "base/logging.h"
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
#include "base/nss_util.h"
#endif
@@ -85,7 +85,7 @@ void DESMakeKey(const uint8* raw, uint8* key) {
key[7] = DESSetKeyParity((raw[6] << 1));
}
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
void DESEncrypt(const uint8* key, const uint8* src, uint8* hash) {
CK_MECHANISM_TYPE cipher_mech = CKM_DES_ECB;