Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: crypto/wincrypt_shim.h

Issue 956613002: Reland "Cut down /crypto and switch what is left of it to boringssl". (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « crypto/third_party/nss/sha512.cc ('k') | mojo/tools/data/unittests » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/wincrypt_shim.h
diff --git a/crypto/wincrypt_shim.h b/crypto/wincrypt_shim.h
deleted file mode 100644
index 799ac49feeb55dcb1363b1614b93ac37dd9e3da0..0000000000000000000000000000000000000000
--- a/crypto/wincrypt_shim.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef NET_CRYPTO_WINCRYPT_SHIM_H_
-#define NET_CRYPTO_WINCRYPT_SHIM_H_
-
-// wincrypt.h defines macros which conflict with OpenSSL's types. This header
-// includes wincrypt and undefines the OpenSSL macros which conflict. Any
-// Chromium headers which include wincrypt should instead include this header.
-
-#include <windows.h>
-#include <wincrypt.h>
-
-// Undefine the macros which conflict with OpenSSL and define replacements. See
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa378145(v=vs.85).aspx
-#undef X509_CERT_PAIR
-#undef X509_EXTENSIONS
-#undef X509_NAME
-
-#define WINCRYPT_X509_CERT_PAIR ((LPCSTR) 53)
-#define WINCRYPT_X509_EXTENSIONS ((LPCSTR) 5)
-#define WINCRYPT_X509_NAME ((LPCSTR) 7)
-
-#endif // NET_CRYPTO_WINCRYPT_SHIM_H_
« no previous file with comments | « crypto/third_party/nss/sha512.cc ('k') | mojo/tools/data/unittests » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698