| Index: net/third_party/nss/ssl/ssl.h
 | 
| diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h
 | 
| index 21d7c8dda7f5e8783e634eb53009115c367e122c..5906ca933a278e029ff16942cb970f5e0938cef1 100644
 | 
| --- a/net/third_party/nss/ssl/ssl.h
 | 
| +++ b/net/third_party/nss/ssl/ssl.h
 | 
| @@ -437,6 +437,43 @@ SSL_IMPORT PRFileDesc *SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd);
 | 
|   */
 | 
|  SSL_IMPORT SECStatus SSL_SetPKCS11PinArg(PRFileDesc *fd, void *a);
 | 
|  
 | 
| +
 | 
| +/*
 | 
| + * Set the client side user name and password non-interactively.
 | 
| + */
 | 
| +SSL_IMPORT SECStatus SSL_SetUserLogin(PRFileDesc *fd,
 | 
| +                                      const char *u,
 | 
| +                                      const char *p);
 | 
| +
 | 
| +/*
 | 
| + * This sets the client side callback for SSL to retrieve the user password.
 | 
| + *	 fd - the file descriptor for the connection in question
 | 
| + * func - callback function pointer
 | 
| + *   pw - user password
 | 
| + */
 | 
| +
 | 
| +typedef SECStatus (PR_CALLBACK *SSLUserPasswdCB)(PRFileDesc *fd,
 | 
| +                                                 SECItem *pw, void *arg);
 | 
| +
 | 
| +SSL_IMPORT SECStatus SSL_UserPasswdHook(PRFileDesc *fd, SSLUserPasswdCB func,
 | 
| +                                                                void *arg);
 | 
| +
 | 
| +/*
 | 
| + * This sets the server side callback function for SSL to retrieve the SRP
 | 
| + * authentication parameters associated with a specific user login.
 | 
| + *   fd - the file descriptor of the connection
 | 
| + * func - pointer to the callback function
 | 
| + * user - username to lookup in app database
 | 
| + *  srp - SRP auth paramters supplied to SSL by app
 | 
| + */
 | 
| +
 | 
| +typedef SECStatus (PR_CALLBACK *SSLGetSRPParamsCB)(PRFileDesc *fd,
 | 
| +                                                     SECKEYSRPParams *srp,
 | 
| +                                                     void *arg);
 | 
| +
 | 
| +SSL_IMPORT SECStatus SSL_GetSRPParamsHook(PRFileDesc *fd,
 | 
| +                                            SSLGetSRPParamsCB func, void *arg);
 | 
| +
 | 
|  /*
 | 
|  ** This is a callback for dealing with server certs that are not authenticated
 | 
|  ** by the client.  The client app can decide that it actually likes the
 | 
| @@ -703,6 +740,7 @@ SSL_IMPORT SSL3Statistics * SSL_GetStatistics(void);
 | 
|  /* Report more information than SSL_SecurityStatus.
 | 
|  ** Caller supplies the info struct.  Function fills it in.
 | 
|  */
 | 
| +SSL_IMPORT SECStatus SSL_GetChannelUsername(PRFileDesc *fd, SECItem *user);
 | 
|  SSL_IMPORT SECStatus SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info,
 | 
|                                          PRUintn len);
 | 
|  SSL_IMPORT SECStatus SSL_GetCipherSuiteInfo(PRUint16 cipherSuite, 
 | 
| 
 |