diff options
Diffstat (limited to 'security/nss/lib/ssl/sslimpl.h')
| -rw-r--r-- | security/nss/lib/ssl/sslimpl.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h index c4e68a4c9..98beb5097 100644 --- a/security/nss/lib/ssl/sslimpl.h +++ b/security/nss/lib/ssl/sslimpl.h @@ -113,7 +113,7 @@ typedef enum { SSLAppOpRead = 0, #define SSL_MIN_MASTER_KEY_BYTES 5 #define SSL_MAX_MASTER_KEY_BYTES 64 -#define SSL2_SESSIONID_BYTES 16 +#define SSL_SESSIONID_BYTES 16 #define SSL3_SESSIONID_BYTES 32 #define SSL_MIN_CHALLENGE_BYTES 16 @@ -208,7 +208,7 @@ struct sslBufferStr { ** SSL3 cipher suite policy and preference struct. */ typedef struct { -#if !defined(_WIN32) +#ifdef AIX unsigned int cipher_suite : 16; unsigned int policy : 8; unsigned int enabled : 1; @@ -711,7 +711,7 @@ struct sslSessionIDStr { union { struct { /* the V2 code depends upon the size of sessionID. */ - unsigned char sessionID[SSL2_SESSIONID_BYTES]; + unsigned char sessionID[SSL_SESSIONID_BYTES]; /* Stuff used to recreate key and read/write cipher objects */ SECItem masterKey; @@ -1247,11 +1247,8 @@ void ssl_Trace(const char *format, ...); SEC_END_PROTOS -#if defined(XP_UNIX) +#ifdef XP_UNIX #define SSL_GETPID() getpid() -#elif defined(WIN32) -/* #define SSL_GETPID() GetCurrentProcessId() */ -#define SSL_GETPID() _getpid() #else #define SSL_GETPID() 0 #endif |