Rename crypto/third_party/nss headers to avoid mixups.

When trying to include the real NSS headers from other files under
crypto/third_party/nss, the local versions would get used on the MSVS
build.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/8538025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110009 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 22 insertions, 22 deletions

diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index 3f1b4ba..3a56631 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -93,11 +93,11 @@
               'signature_creator_nss.cc',
               'signature_verifier_nss.cc',
               'symmetric_key_nss.cc',
-              'third_party/nss/blapi.h',
-              'third_party/nss/blapit.h',
+              'third_party/nss/chromium-blapi.h',
+              'third_party/nss/chromium-blapit.h',
               'third_party/nss/chromium-nss.h',
+              'third_party/nss/chromium-sha256.h',
               'third_party/nss/pk11akey.cc',
-              'third_party/nss/sha256.h',
               'third_party/nss/sha512.cc',
             ],
           }, {
@@ -178,11 +178,11 @@
         'symmetric_key_nss.cc',
         'symmetric_key_openssl.cc',
         'symmetric_key_win.cc',
-        'third_party/nss/blapi.h',
-        'third_party/nss/blapit.h',
+        'third_party/nss/chromium-blapi.h',
+        'third_party/nss/chromium-blapit.h',
         'third_party/nss/chromium-nss.h',
+        'third_party/nss/chromium-sha256.h',
         'third_party/nss/pk11akey.cc',
-        'third_party/nss/sha256.h',
         'third_party/nss/sha512.cc',
       ],
     },
diff --git a/crypto/hmac_win.cc b/crypto/hmac_win.cc
index 34facc5..3522bed 100644
--- a/crypto/hmac_win.cc
+++ b/crypto/hmac_win.cc
@@ -12,8 +12,8 @@
 
 #include "base/logging.h"
 #include "crypto/scoped_capi_types.h"
-#include "crypto/third_party/nss/blapi.h"
-#include "crypto/third_party/nss/sha256.h"
+#include "crypto/third_party/nss/chromium-blapi.h"
+#include "crypto/third_party/nss/chromium-sha256.h"
 
 namespace crypto {
 
diff --git a/crypto/secure_hash_default.cc b/crypto/secure_hash_default.cc
index b24221b..d85754a 100644
--- a/crypto/secure_hash_default.cc
+++ b/crypto/secure_hash_default.cc
@@ -5,8 +5,8 @@
 #include "crypto/secure_hash.h"
 
 #include "base/logging.h"
-#include "crypto/third_party/nss/blapi.h"
-#include "crypto/third_party/nss/sha256.h"
+#include "crypto/third_party/nss/chromium-blapi.h"
+#include "crypto/third_party/nss/chromium-sha256.h"
 
 namespace crypto {
 
diff --git a/crypto/third_party/nss/blapi.h b/crypto/third_party/nss/chromium-blapi.h
index 3b0c60a..2ca772e 100644
--- a/crypto/third_party/nss/blapi.h
+++ b/crypto/third_party/nss/chromium-blapi.h
@@ -39,10 +39,10 @@
  * ***** END LICENSE BLOCK ***** */
 /* $Id: blapi.h,v 1.27 2007/11/09 18:49:32 wtc%google.com Exp $ */
 
-#ifndef _BLAPI_H_
-#define _BLAPI_H_
+#ifndef CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPI_H_
+#define CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPI_H_
 
-#include "crypto/third_party/nss/blapit.h"
+#include "crypto/third_party/nss/chromium-blapit.h"
 
 /******************************************/
 
@@ -98,4 +98,4 @@ extern SECStatus SHA384_Flatten(SHA384Context *cx,unsigned char *space);
 extern SHA384Context * SHA384_Resurrect(unsigned char *space, void *arg);
 extern void SHA384_Clone(SHA384Context *dest, SHA384Context *src);
 
-#endif /* _BLAPI_H_ */
+#endif /* CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPI_H_ */
diff --git a/crypto/third_party/nss/blapit.h b/crypto/third_party/nss/chromium-blapit.h
index e16a084..669f64d 100644
--- a/crypto/third_party/nss/blapit.h
+++ b/crypto/third_party/nss/chromium-blapit.h
@@ -40,8 +40,8 @@
  * ***** END LICENSE BLOCK ***** */
 /* $Id: blapit.h,v 1.20 2007/02/28 19:47:37 rrelyea%redhat.com Exp $ */
 
-#ifndef _BLAPIT_H_
-#define _BLAPIT_H_
+#ifndef CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPIT_H_
+#define CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPIT_H_
 
 #include "base/third_party/nspr/prtypes.h"
 
@@ -88,4 +88,4 @@ typedef struct SHA512ContextStr     SHA512Context;
 /* SHA384Context is really a SHA512ContextStr.  This is not a mistake. */
 typedef struct SHA512ContextStr     SHA384Context;
 
-#endif /* _BLAPIT_H_ */
+#endif /* CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPIT_H_ */
diff --git a/crypto/third_party/nss/sha256.h b/crypto/third_party/nss/chromium-sha256.h
index e641b49..14661dc 100644
--- a/crypto/third_party/nss/sha256.h
+++ b/crypto/third_party/nss/chromium-sha256.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _SHA_256_H_
-#define _SHA_256_H_
+#ifndef CRYPTO_THIRD_PARTY_NSS_CHROMIUM_SHA_256_H_
+#define CRYPTO_THIRD_PARTY_NSS_CHROMIUM_SHA_256_H_
 
 #include "base/third_party/nspr/prtypes.h"
 
@@ -48,4 +48,4 @@ struct SHA256ContextStr {
     PRUint32 sizeHi,sizeLo;	/* 64-bit count of hashed bytes. */
 };
 
-#endif /* _SHA_256_H_ */
+#endif /* CRYPTO_THIRD_PARTY_NSS_CHROMIUM_SHA_256_H_ */
diff --git a/crypto/third_party/nss/sha512.cc b/crypto/third_party/nss/sha512.cc
index 6c04674..976a604 100644
--- a/crypto/third_party/nss/sha512.cc
+++ b/crypto/third_party/nss/sha512.cc
@@ -47,8 +47,8 @@
 #define NOUNROLL512 1
 #undef HAVE_LONG_LONG
 #endif
-#include "crypto/third_party/nss/blapi.h"
-#include "crypto/third_party/nss/sha256.h"    /* for struct SHA256ContextStr */
+#include "crypto/third_party/nss/chromium-blapi.h"
+#include "crypto/third_party/nss/chromium-sha256.h"    /* for struct SHA256ContextStr */
 
 #include <stdlib.h>
 #include <string.h>