Chromium Code Reviews| Index: net/third_party/nss/ssl/sslimpl.h |
| =================================================================== |
| --- net/third_party/nss/ssl/sslimpl.h (revision 75055) |
| +++ net/third_party/nss/ssl/sslimpl.h (working copy) |
| @@ -473,8 +473,18 @@ |
| int inlen); |
| typedef SECStatus (*SSLDestroy)(void *context, PRBool freeit); |
| +#ifdef NSS_PLATFORM_CLIENT_AUTH |
| +#if defined(XP_WIN32) |
| +typedef PCERT_KEY_CONTEXT PlatformKey; |
| +#elif defined(XP_MACOSX) |
| +typedef SecKeyRef PlatformKey; |
| +#else |
| +typedef void *PlatformKey; |
| +#endif |
| +#endif |
| + |
| /* |
| ** ssl3State and CipherSpec structs |
| */ |
| @@ -834,15 +844,6 @@ |
| PRBool nextProtoNego;/* Our peer has sent this extension */ |
|
wtc
2011/02/17 00:04:29
Note that this line comes from nextproto.patch, wh
|
| } SSL3HandshakeState; |
| -#ifdef NSS_PLATFORM_CLIENT_AUTH |
| -#if defined(XP_WIN32) |
| -typedef PCERT_KEY_CONTEXT PlatformKey; |
| -#elif defined(XP_MACOSX) |
| -typedef SecKeyRef PlatformKey; |
| -#else |
| -typedef void *PlatformKey; |
| -#endif |
| -#endif |
| /* |