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

Support the TLS_RSA_WITH_NULL_SHA cipher suite. Bug 161529.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@126906 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelsonb%netscape.com 2002-08-09 21:53:17 +00:00
parent 81521b0299
commit a621affedc
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/security/nss/lib/ssl/ssl3con.c
View File

@ -33,7 +33,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: ssl3con.c,v 1.39 2002-08-07 20:01:51 nelsonb%netscape.com Exp $
* $Id: ssl3con.c,v 1.40 2002-08-09 21:53:15 nelsonb%netscape.com Exp $
*/
#include "nssrenam.h"
@ -123,6 +123,7 @@ static ssl3CipherSuiteCfg cipherSuites[ssl_V3_SUITES_IMPLEMENTED] = {
{ SSL_RSA_EXPORT_WITH_RC4_40_MD5, SSL_NOT_ALLOWED, PR_TRUE, PR_FALSE},
{ SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5, SSL_NOT_ALLOWED, PR_TRUE, PR_FALSE},
{ SSL_FORTEZZA_DMS_WITH_NULL_SHA, SSL_NOT_ALLOWED, PR_TRUE, PR_FALSE},
{ SSL_RSA_WITH_NULL_SHA, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE},
{ SSL_RSA_WITH_NULL_MD5, SSL_NOT_ALLOWED, PR_FALSE,PR_FALSE}
};

3
mozilla/security/nss/lib/ssl/sslenum.c
View File

@ -34,7 +34,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: sslenum.c,v 1.5 2001-11-02 04:24:20 nelsonb%netscape.com Exp $
* $Id: sslenum.c,v 1.6 2002-08-09 21:53:17 nelsonb%netscape.com Exp $
*/
#include "ssl.h"
@ -81,6 +81,7 @@ const PRUint16 SSL_ImplementedCiphers[] = {
/* ciphersuites with no encryption */
SSL_FORTEZZA_DMS_WITH_NULL_SHA,
SSL_RSA_WITH_NULL_SHA,
SSL_RSA_WITH_NULL_MD5,
/* SSL2 cipher suites. */

4
mozilla/security/nss/lib/ssl/sslimpl.h
View File

@ -34,7 +34,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: sslimpl.h,v 1.24 2002-04-04 00:14:09 nelsonb%netscape.com Exp $
* $Id: sslimpl.h,v 1.25 2002-08-09 21:53:17 nelsonb%netscape.com Exp $
*/
#ifndef __sslimpl_h_
@ -254,7 +254,7 @@ typedef struct {
#endif
} ssl3CipherSuiteCfg;
#define ssl_V3_SUITES_IMPLEMENTED 25
#define ssl_V3_SUITES_IMPLEMENTED 26
typedef struct sslOptionsStr {
unsigned int useSecurity : 1; /* 1 */

3
mozilla/security/nss/lib/ssl/sslinfo.c
View File

@ -30,7 +30,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: sslinfo.c,v 1.4 2002-03-22 21:43:42 nelsonb%netscape.com Exp $
* $Id: sslinfo.c,v 1.5 2002-08-09 21:53:17 nelsonb%netscape.com Exp $
*/
#include "ssl.h"
#include "sslimpl.h"
@ -161,6 +161,7 @@ static const SSLCipherSuiteInfo suiteInfo[] = {
{0,CS(SSL_RSA_EXPORT_WITH_RC4_40_MD5), S_RSA, K_RSA, C_RC4, B_40, M_MD5, 0, 1, 0, },
{0,CS(SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5), S_RSA, K_RSA, C_RC2, B_40, M_MD5, 0, 1, 0, },
{0,CS(SSL_FORTEZZA_DMS_WITH_NULL_SHA), S_KEA, K_KEA, C_NULL,B_0, M_SHA, 0, 1, 0, },
{0,CS(SSL_RSA_WITH_NULL_SHA), S_RSA, K_RSA, C_NULL,B_0, M_SHA, 0, 1, 0, },
{0,CS(SSL_RSA_WITH_NULL_MD5), S_RSA, K_RSA, C_NULL,B_0, M_MD5, 0, 1, 0, },
/* SSL 2 table */

3
mozilla/security/nss/lib/ssl/sslsock.c
View File

@ -35,7 +35,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: sslsock.c,v 1.29 2002-07-30 20:56:32 bishakhabanerjee%netscape.com Exp $
* $Id: sslsock.c,v 1.30 2002-08-09 21:53:17 nelsonb%netscape.com Exp $
*/
#include "seccomon.h"
#include "cert.h"
@ -83,6 +83,7 @@ static cipherPolicy ssl_ciphers[] = { /* Export France */
{ SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA, SSL_NOT_ALLOWED, SSL_NOT_ALLOWED },
{ SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, SSL_NOT_ALLOWED, SSL_NOT_ALLOWED },
{ TLS_DHE_DSS_WITH_RC4_128_SHA, SSL_NOT_ALLOWED, SSL_NOT_ALLOWED },
{ SSL_RSA_WITH_NULL_SHA, SSL_ALLOWED, SSL_ALLOWED },
{ SSL_RSA_WITH_NULL_MD5, SSL_ALLOWED, SSL_ALLOWED },
{ TLS_DHE_DSS_WITH_AES_128_CBC_SHA, SSL_NOT_ALLOWED, SSL_NOT_ALLOWED },
{ TLS_DHE_RSA_WITH_AES_128_CBC_SHA, SSL_NOT_ALLOWED, SSL_NOT_ALLOWED },