Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 635778: Rename SSL_ConfigSecureServerWithChainOpt to

Browse Source 
SSL_ConfigSecureServerWithCertChain.  List the certChainOpt argument
immediately after the cert argument.  Improve comments.
Modified Files:
	ssl.def ssl.h sslsecur.c


git-svn-id: svn://10.0.0.236/trunk@262164 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2011-04-08 05:37:44 +00:00
parent 450be17ef0
commit daa3cd26f4
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/security/nss/lib/ssl/ssl.def
View File

@ -154,7 +154,7 @@ SSL_SNISocketConfigHook;
;+};
;+NSS_3.12.10 { # NSS 3.12.10 release
;+ global:
SSL_ConfigSecureServerWithChainOpt;
SSL_ConfigSecureServerWithCertChain;
;+ local:
;+*;
;+};

11
mozilla/security/nss/lib/ssl/ssl.h
View File

@ -36,7 +36,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: ssl.h,v 1.40 2011-03-10 04:29:04 alexei.volkov.bugs%sun.com Exp $ */
/* $Id: ssl.h,v 1.41 2011-04-08 05:37:44 wtc%google.com Exp $ */
#ifndef __ssl_h_
#define __ssl_h_
@ -373,12 +373,13 @@ SSL_IMPORT SECStatus SSL_ConfigSecureServer(
SECKEYPrivateKey *key, SSLKEAType kea);
/*
** Allows SSL socket configuration with caller certificate chain.
** Allows SSL socket configuration with caller-supplied certificate chain.
** If certChainOpt is NULL, tries to find one.
*/
SSL_IMPORT SECStatus
SSL_ConfigSecureServerWithChainOpt(PRFileDesc *fd, CERTCertificate *cert,
SECKEYPrivateKey *key, SSLKEAType kea,
const CERTCertificateList *certChainOpt);
SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
const CERTCertificateList *certChainOpt,
SECKEYPrivateKey *key, SSLKEAType kea);
/*
** Configure a secure server's session-id cache. Define the maximum number

10
mozilla/security/nss/lib/ssl/sslsecur.c
View File

@ -37,7 +37,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: sslsecur.c,v 1.48 2011-03-10 04:29:04 alexei.volkov.bugs%sun.com Exp $ */
/* $Id: sslsecur.c,v 1.49 2011-04-08 05:37:44 wtc%google.com Exp $ */
#include "cert.h"
#include "secitem.h"
#include "keyhi.h"
@ -757,13 +757,13 @@ SSL_ConfigSecureServer(PRFileDesc *fd, CERTCertificate *cert,
SECKEYPrivateKey *key, SSL3KEAType kea)
{
return SSL_ConfigSecureServerWithChainOpt(fd, cert, key, kea, NULL);
return SSL_ConfigSecureServerWithCertChain(fd, cert, NULL, key, kea);
}
SECStatus
SSL_ConfigSecureServerWithChainOpt(PRFileDesc *fd, CERTCertificate *cert,
SECKEYPrivateKey *key, SSL3KEAType kea,
const CERTCertificateList *certChainOpt)
SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
const CERTCertificateList *certChainOpt,
SECKEYPrivateKey *key, SSL3KEAType kea)
{
sslSocket *ss;
SECKEYPublicKey *pubKey = NULL;