Back out the preceeding fortezza removal patch, which was accidentally

applied to the trunk, not to the intended branch.

1 files changed, 14 insertions, 2 deletions

diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h
index ae6cb8a72..f42bd4be3 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 /* deprecated, must preserve */
+#define calg_fortezza	ssl_calg_fortezza
 #define calg_aes	ssl_calg_aes
 
 #define mac_null	ssl_mac_null
@@ -414,6 +414,7 @@ typedef enum {
     cipher_3des, 
     cipher_des40,
     cipher_idea, 
+    cipher_fortezza,
     cipher_aes_128,
     cipher_aes_256,
     cipher_missing              /* reserved for no such supported cipher */
@@ -521,6 +522,7 @@ struct sslSessionIDStr {
 	    SSL3CompressionMethod compression;
 	    PRBool                resumable;
 	    int                   policy;
+	    PRBool                hasFortezza;
 	    ssl3SidKeys           keys;
 	    CK_MECHANISM_TYPE     masterWrapMech;
 				  /* mechanism used to wrap master secret */
@@ -558,6 +560,11 @@ 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;
 };
@@ -653,7 +660,12 @@ 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".
@@ -692,7 +704,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 {