diff options
author | nelsonb%netscape.com <devnull@localhost> | 2005-04-06 19:43:19 +0000 |
---|---|---|
committer | nelsonb%netscape.com <devnull@localhost> | 2005-04-06 19:43:19 +0000 |
commit | bacf6dd62bff2253687c3a993cbce138cb39a7d1 (patch) | |
tree | 3597dd003ebc3d90d4c0c5c096d9f341d28d5d02 /security/nss/lib/ssl/sslimpl.h | |
parent | 26544f3a28a76ed1a2561a4ddb4aaf805f409f4a (diff) | |
parent | 8047a8767235d27070be6c2dab297c6260d107bd (diff) | |
download | nss-hg-bacf6dd62bff2253687c3a993cbce138cb39a7d1.tar.gz |
Remove fortezza support from libSSL and related commands. Bug 239960.
ON PERFORMANCE_HACKS_BRANCH. r=rrelyea.
Diffstat (limited to 'security/nss/lib/ssl/sslimpl.h')
-rw-r--r-- | security/nss/lib/ssl/sslimpl.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h index f42bd4be3..ae6cb8a72 100644 --- a/security/nss/lib/ssl/sslimpl.h +++ b/security/nss/lib/ssl/sslimpl.h @@ -84,7 +84,7 @@ typedef SSLSignType SSL3SignType; #define calg_des ssl_calg_des #define calg_3des ssl_calg_3des #define calg_idea ssl_calg_idea -#define calg_fortezza ssl_calg_fortezza +#define calg_fortezza ssl_calg_fortezza /* deprecated, must preserve */ #define calg_aes ssl_calg_aes #define mac_null ssl_mac_null @@ -414,7 +414,6 @@ typedef enum { cipher_3des, cipher_des40, cipher_idea, - cipher_fortezza, cipher_aes_128, cipher_aes_256, cipher_missing /* reserved for no such supported cipher */ @@ -522,7 +521,6 @@ struct sslSessionIDStr { SSL3CompressionMethod compression; PRBool resumable; int policy; - PRBool hasFortezza; ssl3SidKeys keys; CK_MECHANISM_TYPE masterWrapMech; /* mechanism used to wrap master secret */ @@ -560,11 +558,6 @@ struct sslSessionIDStr { char masterValid; char clAuthValid; - /* the following values are used only in the client, and only - * with fortezza. - */ - SSL3Opaque clientWriteSave[80]; - int clientWriteSaveLen; } ssl3; } u; }; @@ -660,12 +653,7 @@ const ssl3CipherSuiteDef *suite_def; /* protected by recvBufLock */ } SSL3HandshakeState; -struct SSL3FortezzaKEAParamsStr { - unsigned char R_s[128]; /* server's "random" public key */ - PK11SymKey * tek; -}; -typedef struct SSL3FortezzaKEAParamsStr SSL3FortezzaKEAParams; /* ** This is the "ssl3" struct, as in "ss->ssl3". @@ -704,7 +692,7 @@ struct ssl3StateStr { /* chain while we are trying to validate it. */ CERTDistNames * ca_list; /* used by server. trusted CAs for this socket. */ - SSL3FortezzaKEAParams fortezza; + }; typedef struct { |