Add TLS-SRP (RFC 5054) support

net/third_party/nss/ssl/sslsecur.c

 /*
  * Various SSL functions.
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 884 matching lines @@
         ss->sec.hashcx          = NULL;
     }
 
     SECITEM_CopyItem(0, &ss->sec.sendSecret, &os->sec.sendSecret);
     if (os->sec.sendSecret.data && !ss->sec.sendSecret.data)
         goto loser;
     SECITEM_CopyItem(0, &ss->sec.rcvSecret,  &os->sec.rcvSecret);
     if (os->sec.rcvSecret.data && !ss->sec.rcvSecret.data)
         goto loser;
 
+    SECITEM_CopyItem(0, ss->sec.userName,   os->sec.userName);
+    if (os->sec.userName->data && !ss->sec.userName->data)
+        goto loser;
+    SECITEM_CopyItem(0, ss->sec.userPasswd, os->sec.userPasswd);
+    if (os->sec.userPasswd->data && !ss->sec.userPasswd->data)
+        goto loser;
+  
+    
     /* XXX following code is wrong if either cx != 0 */
     PORT_Assert(os->sec.readcx  == 0);
     PORT_Assert(os->sec.writecx == 0);
     ss->sec.readcx              = os->sec.readcx;
     ss->sec.writecx             = os->sec.writecx;
     ss->sec.destroy             = 0;    
 
     ss->sec.enc                 = os->sec.enc;
     ss->sec.dec                 = os->sec.dec;
 
@@ skipping 61 matching lines @@
 /*
 ** Called from SSL_ResetHandshake (above), and 
 **        from ssl_FreeSocket     in sslsock.c
 ** Caller should hold relevant locks (e.g. XmitBufLock)
 */
 void 
 ssl_DestroySecurityInfo(sslSecurityInfo *sec)
 {
     ssl_ResetSecurityInfo(sec, PR_FALSE);
 
+    if (sec->userName) {
+      SECITEM_FreeItem(sec->userName, PR_TRUE);
+      sec->userName = NULL;
+    }
+    if (sec->userPasswd) {
+      SECITEM_FreeItem(sec->userPasswd, PR_TRUE);
+      sec->userPasswd = NULL;
+    }
+
     PORT_ZFree(sec->writeBuf.buf, sec->writeBuf.space);
     sec->writeBuf.buf = 0;
 
     memset(sec, 0, sizeof *sec);
 }
 
 /************************************************************************/
 
 int 
 ssl_SecureConnect(sslSocket *ss, const PRNetAddr *sa)
@@ skipping 534 matching lines @@
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in SNISocketConfigHook",
                  SSL_GETPID(), fd));
         return SECFailure;
     }
 
     ss->sniSocketConfig = func;
     ss->sniSocketConfigArg = arg;
     return SECSuccess;
 }