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

Side by Side Diff: net/third_party/nss/ssl/sslimpl.h

Issue 6476014: Merge 73913 - When performing SSL client authentication on Windows via NSS, c... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/648/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/third_party/nss/ssl/ssl.h ('k') | net/third_party/nss/ssl/sslplatf.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is PRIVATE to SSL and should be the first thing included by 2 * This file is PRIVATE to SSL and should be the first thing included by
3 * any SSL implementation file. 3 * any SSL implementation file.
4 * 4 *
5 * ***** BEGIN LICENSE BLOCK ***** 5 * ***** BEGIN LICENSE BLOCK *****
6 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 6 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
7 * 7 *
8 * The contents of this file are subject to the Mozilla Public License Version 8 * The contents of this file are subject to the Mozilla Public License Version
9 * 1.1 (the "License"); you may not use this file except in compliance with 9 * 1.1 (the "License"); you may not use this file except in compliance with
10 * the License. You may obtain a copy of the License at 10 * the License. You may obtain a copy of the License at
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 * Finished hash to cover it. */ 847 * Finished hash to cover it. */
848 SECItem origClientHello; 848 SECItem origClientHello;
849 #ifdef NSS_ENABLE_ECC 849 #ifdef NSS_ENABLE_ECC
850 PRUint32 negotiatedECCurves; /* bit mask */ 850 PRUint32 negotiatedECCurves; /* bit mask */
851 #endif /* NSS_ENABLE_ECC */ 851 #endif /* NSS_ENABLE_ECC */
852 PRBool nextProtoNego;/* Our peer has sent this extension */ 852 PRBool nextProtoNego;/* Our peer has sent this extension */
853 } SSL3HandshakeState; 853 } SSL3HandshakeState;
854 854
855 #ifdef NSS_PLATFORM_CLIENT_AUTH 855 #ifdef NSS_PLATFORM_CLIENT_AUTH
856 #if defined(XP_WIN32) 856 #if defined(XP_WIN32)
857 typedef HCRYPTPROV PlatformKey; 857 typedef PCERT_KEY_CONTEXT PlatformKey;
858 #elif defined(XP_MACOSX) 858 #elif defined(XP_MACOSX)
859 typedef SecKeyRef PlatformKey; 859 typedef SecKeyRef PlatformKey;
860 #else 860 #else
861 typedef void *PlatformKey; 861 typedef void *PlatformKey;
862 #endif 862 #endif
863 #endif 863 #endif
864 864
865 865
866 /* 866 /*
867 ** This is the "ssl3" struct, as in "ss->ssl3". 867 ** This is the "ssl3" struct, as in "ss->ssl3".
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after
1819 #elif defined(_WIN32_WCE) 1819 #elif defined(_WIN32_WCE)
1820 #define SSL_GETPID GetCurrentProcessId 1820 #define SSL_GETPID GetCurrentProcessId
1821 #elif defined(WIN32) 1821 #elif defined(WIN32)
1822 extern int __cdecl _getpid(void); 1822 extern int __cdecl _getpid(void);
1823 #define SSL_GETPID _getpid 1823 #define SSL_GETPID _getpid
1824 #else 1824 #else
1825 #define SSL_GETPID() 0 1825 #define SSL_GETPID() 0
1826 #endif 1826 #endif
1827 1827
1828 #endif /* __sslimpl_h_ */ 1828 #endif /* __sslimpl_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/ssl.h ('k') | net/third_party/nss/ssl/sslplatf.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698