2015-10-21 05:03:22 +02:00
|
|
|
/*
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
* vtables (and methods that call through them) for the 4 types of
|
2015-10-21 05:03:22 +02:00
|
|
|
* SSLSockets supported. Only one type is still supported.
|
|
|
|
* Various other functions.
|
|
|
|
*
|
2018-05-04 16:08:28 +02:00
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
2015-10-21 05:03:22 +02:00
|
|
|
#include "seccomon.h"
|
|
|
|
#include "cert.h"
|
|
|
|
#include "keyhi.h"
|
|
|
|
#include "ssl.h"
|
|
|
|
#include "sslimpl.h"
|
|
|
|
#include "sslproto.h"
|
|
|
|
#include "nspr.h"
|
|
|
|
#include "private/pprio.h"
|
2018-05-04 16:08:28 +02:00
|
|
|
#ifndef NO_PKCS11_BYPASS
|
2015-10-21 05:03:22 +02:00
|
|
|
#include "blapi.h"
|
2018-05-04 16:08:28 +02:00
|
|
|
#endif
|
2015-10-21 05:03:22 +02:00
|
|
|
#include "nss.h"
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
#include "pk11pqg.h"
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
#define SET_ERROR_CODE /* reminder */
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
static const sslSocketOps ssl_default_ops = { /* No SSL. */
|
2015-10-21 05:03:22 +02:00
|
|
|
ssl_DefConnect,
|
|
|
|
NULL,
|
|
|
|
ssl_DefBind,
|
|
|
|
ssl_DefListen,
|
|
|
|
ssl_DefShutdown,
|
|
|
|
ssl_DefClose,
|
|
|
|
ssl_DefRecv,
|
|
|
|
ssl_DefSend,
|
|
|
|
ssl_DefRead,
|
|
|
|
ssl_DefWrite,
|
|
|
|
ssl_DefGetpeername,
|
|
|
|
ssl_DefGetsockname
|
|
|
|
};
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
static const sslSocketOps ssl_secure_ops = { /* SSL. */
|
2015-10-21 05:03:22 +02:00
|
|
|
ssl_SecureConnect,
|
|
|
|
NULL,
|
|
|
|
ssl_DefBind,
|
|
|
|
ssl_DefListen,
|
|
|
|
ssl_SecureShutdown,
|
|
|
|
ssl_SecureClose,
|
|
|
|
ssl_SecureRecv,
|
|
|
|
ssl_SecureSend,
|
|
|
|
ssl_SecureRead,
|
|
|
|
ssl_SecureWrite,
|
|
|
|
ssl_DefGetpeername,
|
|
|
|
ssl_DefGetsockname
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
** default settings for socket enables
|
|
|
|
*/
|
|
|
|
static sslOptions ssl_defaults = {
|
2018-05-04 16:08:28 +02:00
|
|
|
{ siBuffer, NULL, 0 }, /* nextProtoNego */
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PR_TRUE, /* useSecurity */
|
|
|
|
PR_FALSE, /* useSocks */
|
|
|
|
PR_FALSE, /* requestCertificate */
|
|
|
|
2, /* requireCertificate */
|
|
|
|
PR_FALSE, /* handshakeAsClient */
|
|
|
|
PR_FALSE, /* handshakeAsServer */
|
|
|
|
PR_FALSE, /* enableSSL2 */ /* now defaults to off in NSS 3.13 */
|
|
|
|
PR_FALSE, /* unusedBit9 */
|
|
|
|
PR_FALSE, /* unusedBit10 */
|
|
|
|
PR_FALSE, /* noCache */
|
|
|
|
PR_FALSE, /* fdx */
|
|
|
|
PR_FALSE, /* v2CompatibleHello */ /* now defaults to off in NSS 3.13 */
|
|
|
|
PR_TRUE, /* detectRollBack */
|
2015-10-21 05:03:22 +02:00
|
|
|
PR_FALSE, /* noStepDown */
|
|
|
|
PR_FALSE, /* bypassPKCS11 */
|
|
|
|
PR_FALSE, /* noLocks */
|
|
|
|
PR_FALSE, /* enableSessionTickets */
|
2018-05-04 16:08:28 +02:00
|
|
|
PR_FALSE, /* enableDeflate */
|
|
|
|
2, /* enableRenegotiation (default: requires extension) */
|
|
|
|
PR_FALSE, /* requireSafeNegotiation */
|
|
|
|
PR_FALSE, /* enableFalseStart */
|
|
|
|
PR_TRUE, /* cbcRandomIV */
|
|
|
|
PR_FALSE, /* enableOCSPStapling */
|
|
|
|
PR_TRUE, /* enableNPN */
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
PR_FALSE, /* enableALPN */
|
|
|
|
PR_TRUE, /* reuseServerECDHEKey */
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
PR_FALSE, /* enableFallbackSCSV */
|
|
|
|
PR_TRUE, /* enableServerDhe */
|
2020-01-07 08:11:52 +01:00
|
|
|
PR_FALSE /* enableExtendedMS */
|
2018-05-04 16:08:28 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* default range of enabled SSL/TLS protocols
|
|
|
|
*/
|
|
|
|
static SSLVersionRange versions_defaults_stream = {
|
|
|
|
SSL_LIBRARY_VERSION_3_0,
|
cherry-picked mozilla NSS upstream changes (to rev 82de44ead36f, which is on par with 3.18):
bug1095307, bug1073330(backout), bug1084986, bug1050069, bug942172, bug1054547, bug532081, bug1096348, bug1058870, bug1093940, bug1102985, bug1112461, bug1094492, bug112029, bug1119983, bug1120685, bug1120691, bug1113632, bug863076, bug1082973, bug1124539, bug1117617, bug1117621, bug1121273, bug753136, bug921684, bug1132818, bug1125375, bug647690, bug1055441, bug1134455, bug975010, bug950369, bug1128367, bug1129573, bug1136095, bug1117897, bug1113453, bug1061725, bug1073330, bug1111901, bug1083900, bug1136095, bug1138820, bug1096741, bug1134548, bug345725, bug950348, bug950344, bug1151037, bug991783, bug1153994
2018-07-11 16:42:30 +02:00
|
|
|
SSL_LIBRARY_VERSION_TLS_1_2
|
2018-05-04 16:08:28 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
static SSLVersionRange versions_defaults_datagram = {
|
|
|
|
SSL_LIBRARY_VERSION_TLS_1_1,
|
cherry-picked mozilla NSS upstream changes (to rev 82de44ead36f, which is on par with 3.18):
bug1095307, bug1073330(backout), bug1084986, bug1050069, bug942172, bug1054547, bug532081, bug1096348, bug1058870, bug1093940, bug1102985, bug1112461, bug1094492, bug112029, bug1119983, bug1120685, bug1120691, bug1113632, bug863076, bug1082973, bug1124539, bug1117617, bug1117621, bug1121273, bug753136, bug921684, bug1132818, bug1125375, bug647690, bug1055441, bug1134455, bug975010, bug950369, bug1128367, bug1129573, bug1136095, bug1117897, bug1113453, bug1061725, bug1073330, bug1111901, bug1083900, bug1136095, bug1138820, bug1096741, bug1134548, bug345725, bug950348, bug950344, bug1151037, bug991783, bug1153994
2018-07-11 16:42:30 +02:00
|
|
|
SSL_LIBRARY_VERSION_TLS_1_2
|
2015-10-21 05:03:22 +02:00
|
|
|
};
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
#define VERSIONS_DEFAULTS(variant) \
|
|
|
|
(variant == ssl_variant_stream ? &versions_defaults_stream : \
|
|
|
|
&versions_defaults_datagram)
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
sslSessionIDLookupFunc ssl_sid_lookup;
|
|
|
|
sslSessionIDCacheFunc ssl_sid_cache;
|
|
|
|
sslSessionIDUncacheFunc ssl_sid_uncache;
|
|
|
|
|
|
|
|
static PRBool ssl_inited = PR_FALSE;
|
|
|
|
static PRDescIdentity ssl_layer_id;
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRBool locksEverDisabled; /* implicitly PR_FALSE */
|
|
|
|
PRBool ssl_force_locks; /* implicitly PR_FALSE */
|
|
|
|
int ssl_lock_readers = 1; /* default true. */
|
2015-10-21 05:03:22 +02:00
|
|
|
char ssl_debug;
|
|
|
|
char ssl_trace;
|
|
|
|
FILE * ssl_trace_iob;
|
2018-05-04 16:08:28 +02:00
|
|
|
FILE * ssl_keylog_iob;
|
2015-10-21 05:03:22 +02:00
|
|
|
char lockStatus[] = "Locks are ENABLED. ";
|
|
|
|
#define LOCKSTATUS_OFFSET 10 /* offset of ENABLED */
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
/* SRTP_NULL_HMAC_SHA1_80 and SRTP_NULL_HMAC_SHA1_32 are not implemented. */
|
|
|
|
static const PRUint16 srtpCiphers[] = {
|
|
|
|
SRTP_AES128_CM_HMAC_SHA1_80,
|
|
|
|
SRTP_AES128_CM_HMAC_SHA1_32,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
/* forward declarations. */
|
2018-05-04 16:08:28 +02:00
|
|
|
static sslSocket *ssl_NewSocket(PRBool makeLocks, SSLProtocolVariant variant);
|
2015-10-21 05:03:22 +02:00
|
|
|
static SECStatus ssl_MakeLocks(sslSocket *ss);
|
2018-05-04 16:08:28 +02:00
|
|
|
static void ssl_SetDefaultsFromEnvironment(void);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
static PRStatus ssl_PushIOLayer(sslSocket *ns, PRFileDesc *stack,
|
2015-10-21 05:03:22 +02:00
|
|
|
PRDescIdentity id);
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Lookup a socket structure from a file descriptor.
|
|
|
|
** Only functions called through the PRIOMethods table should use this.
|
|
|
|
** Other app-callable functions should use ssl_FindSocket.
|
|
|
|
*/
|
|
|
|
static sslSocket *
|
|
|
|
ssl_GetPrivate(PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
|
|
|
|
PORT_Assert(fd != NULL);
|
|
|
|
PORT_Assert(fd->methods->file_type == PR_DESC_LAYERED);
|
|
|
|
PORT_Assert(fd->identity == ssl_layer_id);
|
|
|
|
|
|
|
|
if (fd->methods->file_type != PR_DESC_LAYERED ||
|
|
|
|
fd->identity != ssl_layer_id) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(PR_BAD_DESCRIPTOR_ERROR);
|
|
|
|
return NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ss = (sslSocket *)fd->secret;
|
2018-05-04 16:08:28 +02:00
|
|
|
/* Set ss->fd lazily. We can't rely on the value of ss->fd set by
|
|
|
|
* ssl_PushIOLayer because another PR_PushIOLayer call will switch the
|
|
|
|
* contents of the PRFileDesc pointed by ss->fd and the new layer.
|
|
|
|
* See bug 807250.
|
|
|
|
*/
|
2015-10-21 05:03:22 +02:00
|
|
|
ss->fd = fd;
|
|
|
|
return ss;
|
|
|
|
}
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* This function tries to find the SSL layer in the stack.
|
2015-10-21 05:03:22 +02:00
|
|
|
* It searches for the first SSL layer at or below the argument fd,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
* and failing that, it searches for the nearest SSL layer above the
|
2015-10-21 05:03:22 +02:00
|
|
|
* argument fd. It returns the private sslSocket from the found layer.
|
|
|
|
*/
|
|
|
|
sslSocket *
|
|
|
|
ssl_FindSocket(PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
PRFileDesc *layer;
|
|
|
|
sslSocket *ss;
|
|
|
|
|
|
|
|
PORT_Assert(fd != NULL);
|
|
|
|
PORT_Assert(ssl_layer_id != 0);
|
|
|
|
|
|
|
|
layer = PR_GetIdentitiesLayer(fd, ssl_layer_id);
|
|
|
|
if (layer == NULL) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(PR_BAD_DESCRIPTOR_ERROR);
|
|
|
|
return NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ss = (sslSocket *)layer->secret;
|
2018-05-04 16:08:28 +02:00
|
|
|
/* Set ss->fd lazily. We can't rely on the value of ss->fd set by
|
|
|
|
* ssl_PushIOLayer because another PR_PushIOLayer call will switch the
|
|
|
|
* contents of the PRFileDesc pointed by ss->fd and the new layer.
|
|
|
|
* See bug 807250.
|
|
|
|
*/
|
2015-10-21 05:03:22 +02:00
|
|
|
ss->fd = layer;
|
|
|
|
return ss;
|
|
|
|
}
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
static sslSocket *
|
2015-10-21 05:03:22 +02:00
|
|
|
ssl_DupSocket(sslSocket *os)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
SECStatus rv;
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
ss = ssl_NewSocket((PRBool)(!os->opt.noLocks), os->protocolVariant);
|
2015-10-21 05:03:22 +02:00
|
|
|
if (ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt = os->opt;
|
|
|
|
ss->opt.useSocks = PR_FALSE;
|
|
|
|
ss->vrange = os->vrange;
|
|
|
|
|
|
|
|
ss->peerID = !os->peerID ? NULL : PORT_Strdup(os->peerID);
|
|
|
|
ss->url = !os->url ? NULL : PORT_Strdup(os->url);
|
|
|
|
|
|
|
|
ss->ops = os->ops;
|
|
|
|
ss->rTimeout = os->rTimeout;
|
|
|
|
ss->wTimeout = os->wTimeout;
|
|
|
|
ss->cTimeout = os->cTimeout;
|
|
|
|
ss->dbHandle = os->dbHandle;
|
|
|
|
|
|
|
|
/* copy ssl2&3 policy & prefs, even if it's not selected (yet) */
|
|
|
|
ss->allowedByPolicy = os->allowedByPolicy;
|
|
|
|
ss->maybeAllowedByPolicy= os->maybeAllowedByPolicy;
|
|
|
|
ss->chosenPreference = os->chosenPreference;
|
|
|
|
PORT_Memcpy(ss->cipherSuites, os->cipherSuites, sizeof os->cipherSuites);
|
|
|
|
PORT_Memcpy(ss->ssl3.dtlsSRTPCiphers, os->ssl3.dtlsSRTPCiphers,
|
|
|
|
sizeof(PRUint16) * os->ssl3.dtlsSRTPCipherCount);
|
|
|
|
ss->ssl3.dtlsSRTPCipherCount = os->ssl3.dtlsSRTPCipherCount;
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
PORT_Memcpy(ss->ssl3.signatureAlgorithms, os->ssl3.signatureAlgorithms,
|
|
|
|
sizeof(ss->ssl3.signatureAlgorithms[0]) *
|
|
|
|
os->ssl3.signatureAlgorithmCount);
|
|
|
|
ss->ssl3.signatureAlgorithmCount = os->ssl3.signatureAlgorithmCount;
|
|
|
|
|
|
|
|
ss->ssl3.dheWeakGroupEnabled = os->ssl3.dheWeakGroupEnabled;
|
|
|
|
ss->ssl3.numDHEGroups = os->ssl3.numDHEGroups;
|
|
|
|
if (os->ssl3.dheGroups) {
|
|
|
|
ss->ssl3.dheGroups = PORT_NewArray(SSLDHEGroupType,
|
|
|
|
os->ssl3.numDHEGroups);
|
|
|
|
if (!ss->ssl3.dheGroups) {
|
|
|
|
goto loser;
|
|
|
|
}
|
|
|
|
PORT_Memcpy(ss->ssl3.dheGroups, os->ssl3.dheGroups,
|
|
|
|
sizeof(SSLDHEGroupType) * os->ssl3.numDHEGroups);
|
|
|
|
} else {
|
|
|
|
ss->ssl3.dheGroups = NULL;
|
|
|
|
}
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
|
|
|
|
if (os->cipherSpecs) {
|
|
|
|
ss->cipherSpecs = (unsigned char*)PORT_Alloc(os->sizeCipherSpecs);
|
|
|
|
if (ss->cipherSpecs)
|
|
|
|
PORT_Memcpy(ss->cipherSpecs, os->cipherSpecs,
|
|
|
|
os->sizeCipherSpecs);
|
|
|
|
ss->sizeCipherSpecs = os->sizeCipherSpecs;
|
|
|
|
ss->preferredCipher = os->preferredCipher;
|
|
|
|
} else {
|
|
|
|
ss->cipherSpecs = NULL; /* produced lazily */
|
|
|
|
ss->sizeCipherSpecs = 0;
|
|
|
|
ss->preferredCipher = NULL;
|
|
|
|
}
|
|
|
|
if (ss->opt.useSecurity) {
|
|
|
|
/* This int should be SSLKEAType, but CC on Irix complains,
|
|
|
|
* during the for loop.
|
|
|
|
*/
|
|
|
|
int i;
|
|
|
|
sslServerCerts * oc = os->serverCerts;
|
|
|
|
sslServerCerts * sc = ss->serverCerts;
|
|
|
|
|
|
|
|
for (i=kt_null; i < kt_kea_size; i++, oc++, sc++) {
|
|
|
|
if (oc->serverCert && oc->serverCertChain) {
|
|
|
|
sc->serverCert = CERT_DupCertificate(oc->serverCert);
|
|
|
|
sc->serverCertChain = CERT_DupCertList(oc->serverCertChain);
|
|
|
|
if (!sc->serverCertChain)
|
|
|
|
goto loser;
|
|
|
|
} else {
|
|
|
|
sc->serverCert = NULL;
|
|
|
|
sc->serverCertChain = NULL;
|
|
|
|
}
|
|
|
|
sc->serverKeyPair = oc->serverKeyPair ?
|
|
|
|
ssl3_GetKeyPairRef(oc->serverKeyPair) : NULL;
|
|
|
|
if (oc->serverKeyPair && !sc->serverKeyPair)
|
|
|
|
goto loser;
|
|
|
|
sc->serverKeyBits = oc->serverKeyBits;
|
|
|
|
ss->certStatusArray[i] = !os->certStatusArray[i] ? NULL :
|
|
|
|
SECITEM_DupArray(NULL, os->certStatusArray[i]);
|
|
|
|
}
|
|
|
|
ss->stepDownKeyPair = !os->stepDownKeyPair ? NULL :
|
|
|
|
ssl3_GetKeyPairRef(os->stepDownKeyPair);
|
|
|
|
ss->ephemeralECDHKeyPair = !os->ephemeralECDHKeyPair ? NULL :
|
|
|
|
ssl3_GetKeyPairRef(os->ephemeralECDHKeyPair);
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
ss->dheKeyPair = !os->dheKeyPair ? NULL :
|
|
|
|
ssl3_GetKeyPairRef(os->dheKeyPair);
|
|
|
|
ss->dheParams = os->dheParams;
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
/*
|
2018-05-04 16:08:28 +02:00
|
|
|
* XXX the preceding CERT_ and SECKEY_ functions can fail and return NULL.
|
2015-10-21 05:03:22 +02:00
|
|
|
* XXX We should detect this, and not just march on with NULL pointers.
|
|
|
|
*/
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->authCertificate = os->authCertificate;
|
|
|
|
ss->authCertificateArg = os->authCertificateArg;
|
|
|
|
ss->getClientAuthData = os->getClientAuthData;
|
|
|
|
ss->getClientAuthDataArg = os->getClientAuthDataArg;
|
2018-05-04 16:08:28 +02:00
|
|
|
ss->sniSocketConfig = os->sniSocketConfig;
|
|
|
|
ss->sniSocketConfigArg = os->sniSocketConfigArg;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->handleBadCert = os->handleBadCert;
|
|
|
|
ss->badCertArg = os->badCertArg;
|
|
|
|
ss->handshakeCallback = os->handshakeCallback;
|
|
|
|
ss->handshakeCallbackData = os->handshakeCallbackData;
|
|
|
|
ss->canFalseStartCallback = os->canFalseStartCallback;
|
|
|
|
ss->canFalseStartCallbackData = os->canFalseStartCallbackData;
|
|
|
|
ss->pkcs11PinArg = os->pkcs11PinArg;
|
|
|
|
|
|
|
|
/* Create security data */
|
|
|
|
rv = ssl_CopySecurityInfo(ss, os);
|
|
|
|
if (rv != SECSuccess) {
|
|
|
|
goto loser;
|
|
|
|
}
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return ss;
|
|
|
|
|
|
|
|
loser:
|
|
|
|
ssl_FreeSocket(ss);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ssl_DestroyLocks(sslSocket *ss)
|
|
|
|
{
|
|
|
|
/* Destroy locks. */
|
|
|
|
if (ss->firstHandshakeLock) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PZ_DestroyMonitor(ss->firstHandshakeLock);
|
|
|
|
ss->firstHandshakeLock = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ss->ssl3HandshakeLock) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PZ_DestroyMonitor(ss->ssl3HandshakeLock);
|
|
|
|
ss->ssl3HandshakeLock = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ss->specLock) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
NSSRWLock_Destroy(ss->specLock);
|
|
|
|
ss->specLock = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ss->recvLock) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PZ_DestroyLock(ss->recvLock);
|
|
|
|
ss->recvLock = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ss->sendLock) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PZ_DestroyLock(ss->sendLock);
|
|
|
|
ss->sendLock = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ss->xmitBufLock) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PZ_DestroyMonitor(ss->xmitBufLock);
|
|
|
|
ss->xmitBufLock = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ss->recvBufLock) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PZ_DestroyMonitor(ss->recvBufLock);
|
|
|
|
ss->recvBufLock = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Caller holds any relevant locks */
|
|
|
|
static void
|
|
|
|
ssl_DestroySocketContents(sslSocket *ss)
|
|
|
|
{
|
|
|
|
/* "i" should be of type SSLKEAType, but CC on IRIX complains during
|
|
|
|
* the for loop.
|
|
|
|
*/
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Free up socket */
|
|
|
|
ssl_DestroySecurityInfo(&ss->sec);
|
|
|
|
|
|
|
|
ssl3_DestroySSL3Info(ss);
|
|
|
|
|
|
|
|
PORT_Free(ss->saveBuf.buf);
|
|
|
|
PORT_Free(ss->pendingBuf.buf);
|
|
|
|
ssl_DestroyGather(&ss->gs);
|
|
|
|
|
|
|
|
if (ss->peerID != NULL)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_Free(ss->peerID);
|
2015-10-21 05:03:22 +02:00
|
|
|
if (ss->url != NULL)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_Free((void *)ss->url); /* CONST */
|
2015-10-21 05:03:22 +02:00
|
|
|
if (ss->cipherSpecs) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_Free(ss->cipherSpecs);
|
|
|
|
ss->cipherSpecs = NULL;
|
|
|
|
ss->sizeCipherSpecs = 0;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up server configuration */
|
|
|
|
for (i=kt_null; i < kt_kea_size; i++) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
sslServerCerts * sc = ss->serverCerts + i;
|
|
|
|
if (sc->serverCert != NULL)
|
|
|
|
CERT_DestroyCertificate(sc->serverCert);
|
|
|
|
if (sc->serverCertChain != NULL)
|
|
|
|
CERT_DestroyCertificateList(sc->serverCertChain);
|
|
|
|
if (sc->serverKeyPair != NULL)
|
|
|
|
ssl3_FreeKeyPair(sc->serverKeyPair);
|
|
|
|
if (ss->certStatusArray[i] != NULL) {
|
|
|
|
SECITEM_FreeArray(ss->certStatusArray[i], PR_TRUE);
|
|
|
|
ss->certStatusArray[i] = NULL;
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ss->stepDownKeyPair) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl3_FreeKeyPair(ss->stepDownKeyPair);
|
|
|
|
ss->stepDownKeyPair = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ss->ephemeralECDHKeyPair) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl3_FreeKeyPair(ss->ephemeralECDHKeyPair);
|
|
|
|
ss->ephemeralECDHKeyPair = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
if (ss->dheKeyPair) {
|
|
|
|
ssl3_FreeKeyPair(ss->dheKeyPair);
|
|
|
|
ss->dheKeyPair = NULL;
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
SECITEM_FreeItem(&ss->opt.nextProtoNego, PR_FALSE);
|
|
|
|
if (ss->xtnData.sniNameArr) {
|
|
|
|
PORT_Free(ss->xtnData.sniNameArr);
|
|
|
|
ss->xtnData.sniNameArr = NULL;
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* free an sslSocket struct, and all the stuff that hangs off of it
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
ssl_FreeSocket(sslSocket *ss)
|
|
|
|
{
|
|
|
|
/* Get every lock you can imagine!
|
|
|
|
** Caller already holds these:
|
|
|
|
** SSL_LOCK_READER(ss);
|
|
|
|
** SSL_LOCK_WRITER(ss);
|
|
|
|
*/
|
|
|
|
ssl_Get1stHandshakeLock(ss);
|
|
|
|
ssl_GetRecvBufLock(ss);
|
|
|
|
ssl_GetSSL3HandshakeLock(ss);
|
|
|
|
ssl_GetXmitBufLock(ss);
|
|
|
|
ssl_GetSpecWriteLock(ss);
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
ssl_DestroySocketContents(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
/* Release all the locks acquired above. */
|
2018-05-04 16:08:28 +02:00
|
|
|
SSL_UNLOCK_READER(ss);
|
|
|
|
SSL_UNLOCK_WRITER(ss);
|
|
|
|
ssl_Release1stHandshakeLock(ss);
|
|
|
|
ssl_ReleaseRecvBufLock(ss);
|
|
|
|
ssl_ReleaseSSL3HandshakeLock(ss);
|
|
|
|
ssl_ReleaseXmitBufLock(ss);
|
|
|
|
ssl_ReleaseSpecWriteLock(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
ssl_DestroyLocks(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
#ifdef DEBUG
|
|
|
|
PORT_Memset(ss, 0x1f, sizeof *ss);
|
|
|
|
#endif
|
|
|
|
PORT_Free(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/************************************************************************/
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SECStatus
|
2015-10-21 05:03:22 +02:00
|
|
|
ssl_EnableNagleDelay(sslSocket *ss, PRBool enabled)
|
|
|
|
{
|
|
|
|
PRFileDesc * osfd = ss->fd->lower;
|
|
|
|
SECStatus rv = SECFailure;
|
|
|
|
PRSocketOptionData opt;
|
|
|
|
|
|
|
|
opt.option = PR_SockOpt_NoDelay;
|
|
|
|
opt.value.no_delay = (PRBool)!enabled;
|
|
|
|
|
|
|
|
if (osfd->methods->setsocketoption) {
|
|
|
|
rv = (SECStatus) osfd->methods->setsocketoption(osfd, &opt);
|
|
|
|
} else {
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ssl_ChooseOps(sslSocket *ss)
|
|
|
|
{
|
|
|
|
ss->ops = ss->opt.useSecurity ? &ssl_secure_ops : &ssl_default_ops;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called from SSL_Enable (immediately below) */
|
|
|
|
static SECStatus
|
|
|
|
PrepareSocket(sslSocket *ss)
|
|
|
|
{
|
|
|
|
SECStatus rv = SECSuccess;
|
|
|
|
|
|
|
|
ssl_ChooseOps(ss);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_Enable(PRFileDesc *fd, int which, PRBool on)
|
|
|
|
{
|
|
|
|
return SSL_OptionSet(fd, which, on);
|
|
|
|
}
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
#ifndef NO_PKCS11_BYPASS
|
2015-10-21 05:03:22 +02:00
|
|
|
static const PRCallOnceType pristineCallOnce;
|
|
|
|
static PRCallOnceType setupBypassOnce;
|
|
|
|
|
|
|
|
static SECStatus SSL_BypassShutdown(void* appData, void* nssData)
|
|
|
|
{
|
|
|
|
/* unload freeBL shared library from memory */
|
|
|
|
BL_Unload();
|
|
|
|
setupBypassOnce = pristineCallOnce;
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus SSL_BypassRegisterShutdown(void)
|
|
|
|
{
|
|
|
|
SECStatus rv = NSS_RegisterShutdown(SSL_BypassShutdown, NULL);
|
|
|
|
PORT_Assert(SECSuccess == rv);
|
|
|
|
return SECSuccess == rv ? PR_SUCCESS : PR_FAILURE;
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
#endif
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
static PRStatus SSL_BypassSetup(void)
|
|
|
|
{
|
2018-05-04 16:08:28 +02:00
|
|
|
#ifdef NO_PKCS11_BYPASS
|
|
|
|
/* Guarantee binary compatibility */
|
|
|
|
return PR_SUCCESS;
|
|
|
|
#else
|
2015-10-21 05:03:22 +02:00
|
|
|
return PR_CallOnce(&setupBypassOnce, &SSL_BypassRegisterShutdown);
|
2018-05-04 16:08:28 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implements the semantics for SSL_OptionSet(SSL_ENABLE_TLS, on) described in
|
|
|
|
* ssl.h in the section "SSL version range setting API".
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
ssl_EnableTLS(SSLVersionRange *vrange, PRBool on)
|
|
|
|
{
|
|
|
|
if (SSL3_ALL_VERSIONS_DISABLED(vrange)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on) {
|
|
|
|
vrange->min = SSL_LIBRARY_VERSION_TLS_1_0;
|
|
|
|
vrange->max = SSL_LIBRARY_VERSION_TLS_1_0;
|
|
|
|
} /* else don't change anything */
|
|
|
|
return;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (on) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* Expand the range of enabled version to include TLS 1.0 */
|
|
|
|
vrange->min = PR_MIN(vrange->min, SSL_LIBRARY_VERSION_TLS_1_0);
|
|
|
|
vrange->max = PR_MAX(vrange->max, SSL_LIBRARY_VERSION_TLS_1_0);
|
2018-05-04 16:08:28 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* Disable all TLS versions, leaving only SSL 3.0 if it was enabled */
|
|
|
|
if (vrange->min == SSL_LIBRARY_VERSION_3_0) {
|
|
|
|
vrange->max = SSL_LIBRARY_VERSION_3_0;
|
|
|
|
} else {
|
|
|
|
/* Only TLS was enabled, so now no versions are. */
|
|
|
|
vrange->min = SSL_LIBRARY_VERSION_NONE;
|
|
|
|
vrange->max = SSL_LIBRARY_VERSION_NONE;
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implements the semantics for SSL_OptionSet(SSL_ENABLE_SSL3, on) described in
|
|
|
|
* ssl.h in the section "SSL version range setting API".
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
ssl_EnableSSL3(SSLVersionRange *vrange, PRBool on)
|
|
|
|
{
|
|
|
|
if (SSL3_ALL_VERSIONS_DISABLED(vrange)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on) {
|
|
|
|
vrange->min = SSL_LIBRARY_VERSION_3_0;
|
|
|
|
vrange->max = SSL_LIBRARY_VERSION_3_0;
|
|
|
|
} /* else don't change anything */
|
|
|
|
return;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (on) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* Expand the range of enabled versions to include SSL 3.0. We know
|
|
|
|
* SSL 3.0 or some version of TLS is already enabled at this point, so
|
|
|
|
* we don't need to change vrange->max.
|
|
|
|
*/
|
|
|
|
vrange->min = SSL_LIBRARY_VERSION_3_0;
|
2018-05-04 16:08:28 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* Disable SSL 3.0, leaving TLS unaffected. */
|
|
|
|
if (vrange->max > SSL_LIBRARY_VERSION_3_0) {
|
|
|
|
vrange->min = PR_MAX(vrange->min, SSL_LIBRARY_VERSION_TLS_1_0);
|
|
|
|
} else {
|
|
|
|
/* Only SSL 3.0 was enabled, so now no versions are. */
|
|
|
|
vrange->min = SSL_LIBRARY_VERSION_NONE;
|
|
|
|
vrange->max = SSL_LIBRARY_VERSION_NONE;
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_OptionSet(PRFileDesc *fd, PRInt32 which, PRBool on)
|
|
|
|
{
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
|
|
|
SECStatus rv = SECSuccess;
|
|
|
|
PRBool holdingLocks;
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in Enable", SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
holdingLocks = (!ss->opt.noLocks);
|
|
|
|
ssl_Get1stHandshakeLock(ss);
|
|
|
|
ssl_GetSSL3HandshakeLock(ss);
|
|
|
|
|
|
|
|
switch (which) {
|
|
|
|
case SSL_SOCKS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.useSocks = PR_FALSE;
|
|
|
|
rv = PrepareSocket(ss);
|
|
|
|
if (on) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure;
|
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_SECURITY:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.useSecurity = on;
|
|
|
|
rv = PrepareSocket(ss);
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_REQUEST_CERTIFICATE:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.requestCertificate = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_REQUIRE_CERTIFICATE:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.requireCertificate = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_HANDSHAKE_AS_CLIENT:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if ( ss->opt.handshakeAsServer && on ) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ss->opt.handshakeAsClient = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_HANDSHAKE_AS_SERVER:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if ( ss->opt.handshakeAsClient && on ) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ss->opt.handshakeAsServer = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_TLS:
|
2018-05-04 16:08:28 +02:00
|
|
|
if (IS_DTLS(ss)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure; /* not allowed */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ssl_EnableTLS(&ss->vrange, on);
|
|
|
|
ss->preferredCipher = NULL;
|
|
|
|
if (ss->cipherSpecs) {
|
|
|
|
PORT_Free(ss->cipherSpecs);
|
|
|
|
ss->cipherSpecs = NULL;
|
|
|
|
ss->sizeCipherSpecs = 0;
|
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_SSL3:
|
2018-05-04 16:08:28 +02:00
|
|
|
if (IS_DTLS(ss)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure; /* not allowed */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ssl_EnableSSL3(&ss->vrange, on);
|
|
|
|
ss->preferredCipher = NULL;
|
|
|
|
if (ss->cipherSpecs) {
|
|
|
|
PORT_Free(ss->cipherSpecs);
|
|
|
|
ss->cipherSpecs = NULL;
|
|
|
|
ss->sizeCipherSpecs = 0;
|
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_SSL2:
|
2018-05-04 16:08:28 +02:00
|
|
|
if (IS_DTLS(ss)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure; /* not allowed */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ss->opt.enableSSL2 = on;
|
|
|
|
if (on) {
|
|
|
|
ss->opt.v2CompatibleHello = on;
|
|
|
|
}
|
|
|
|
ss->preferredCipher = NULL;
|
|
|
|
if (ss->cipherSpecs) {
|
|
|
|
PORT_Free(ss->cipherSpecs);
|
|
|
|
ss->cipherSpecs = NULL;
|
|
|
|
ss->sizeCipherSpecs = 0;
|
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_NO_CACHE:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.noCache = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_FDX:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on && ss->opt.noLocks) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure;
|
|
|
|
}
|
|
|
|
ss->opt.fdx = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_V2_COMPATIBLE_HELLO:
|
2018-05-04 16:08:28 +02:00
|
|
|
if (IS_DTLS(ss)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure; /* not allowed */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ss->opt.v2CompatibleHello = on;
|
|
|
|
if (!on) {
|
|
|
|
ss->opt.enableSSL2 = on;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_ROLLBACK_DETECTION:
|
|
|
|
ss->opt.detectRollBack = on;
|
2015-10-21 05:03:22 +02:00
|
|
|
break;
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
case SSL_NO_STEP_DOWN:
|
|
|
|
ss->opt.noStepDown = on;
|
|
|
|
if (on)
|
|
|
|
SSL_DisableExportCipherSuites(fd);
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_BYPASS_PKCS11:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (ss->handshakeBegun) {
|
|
|
|
PORT_SetError(PR_INVALID_STATE_ERROR);
|
|
|
|
rv = SECFailure;
|
|
|
|
} else {
|
2015-10-21 05:03:22 +02:00
|
|
|
if (PR_FALSE != on) {
|
|
|
|
if (PR_SUCCESS == SSL_BypassSetup() ) {
|
2018-05-04 16:08:28 +02:00
|
|
|
#ifdef NO_PKCS11_BYPASS
|
|
|
|
ss->opt.bypassPKCS11 = PR_FALSE;
|
|
|
|
#else
|
|
|
|
ss->opt.bypassPKCS11 = on;
|
|
|
|
#endif
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
|
|
|
rv = SECFailure;
|
|
|
|
}
|
|
|
|
} else {
|
2018-05-04 16:08:28 +02:00
|
|
|
ss->opt.bypassPKCS11 = PR_FALSE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_NO_LOCKS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on && ss->opt.fdx) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure;
|
|
|
|
}
|
|
|
|
if (on && ssl_force_locks)
|
|
|
|
on = PR_FALSE; /* silent override */
|
|
|
|
ss->opt.noLocks = on;
|
|
|
|
if (on) {
|
|
|
|
locksEverDisabled = PR_TRUE;
|
|
|
|
strcpy(lockStatus + LOCKSTATUS_OFFSET, "DISABLED.");
|
|
|
|
} else if (!holdingLocks) {
|
|
|
|
rv = ssl_MakeLocks(ss);
|
|
|
|
if (rv != SECSuccess) {
|
|
|
|
ss->opt.noLocks = PR_TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_SESSION_TICKETS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.enableSessionTickets = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_DEFLATE:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.enableDeflate = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_RENEGOTIATION:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.enableRenegotiation = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_REQUIRE_SAFE_NEGOTIATION:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.requireSafeNegotiation = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_FALSE_START:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.enableFalseStart = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_CBC_RANDOM_IV:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.cbcRandomIV = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_OCSP_STAPLING:
|
|
|
|
ss->opt.enableOCSPStapling = on;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_ENABLE_NPN:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.enableNPN = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_ALPN:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->opt.enableALPN = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
case SSL_REUSE_SERVER_ECDHE_KEY:
|
|
|
|
ss->opt.reuseServerECDHEKey = on;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_ENABLE_FALLBACK_SCSV:
|
|
|
|
ss->opt.enableFallbackSCSV = on;
|
|
|
|
break;
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
case SSL_ENABLE_SERVER_DHE:
|
|
|
|
ss->opt.enableServerDhe = on;
|
|
|
|
break;
|
|
|
|
|
2020-01-07 08:11:52 +01:00
|
|
|
case SSL_ENABLE_EXTENDED_MASTER_SECRET:
|
|
|
|
ss->opt.enableExtendedMS = on;
|
|
|
|
break;
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
default:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* We can't use the macros for releasing the locks here,
|
|
|
|
* because ss->opt.noLocks might have changed just above.
|
|
|
|
* We must release these locks (monitors) here, if we aquired them above,
|
|
|
|
* regardless of the current value of ss->opt.noLocks.
|
|
|
|
*/
|
|
|
|
if (holdingLocks) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PZ_ExitMonitor((ss)->ssl3HandshakeLock);
|
|
|
|
PZ_ExitMonitor((ss)->firstHandshakeLock);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_OptionGet(PRFileDesc *fd, PRInt32 which, PRBool *pOn)
|
|
|
|
{
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
|
|
|
SECStatus rv = SECSuccess;
|
|
|
|
PRBool on = PR_FALSE;
|
|
|
|
|
|
|
|
if (!pOn) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in Enable", SSL_GETPID(), fd));
|
|
|
|
*pOn = PR_FALSE;
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ssl_Get1stHandshakeLock(ss);
|
|
|
|
ssl_GetSSL3HandshakeLock(ss);
|
|
|
|
|
|
|
|
switch (which) {
|
|
|
|
case SSL_SOCKS: on = PR_FALSE; break;
|
|
|
|
case SSL_SECURITY: on = ss->opt.useSecurity; break;
|
|
|
|
case SSL_REQUEST_CERTIFICATE: on = ss->opt.requestCertificate; break;
|
|
|
|
case SSL_REQUIRE_CERTIFICATE: on = ss->opt.requireCertificate; break;
|
|
|
|
case SSL_HANDSHAKE_AS_CLIENT: on = ss->opt.handshakeAsClient; break;
|
|
|
|
case SSL_HANDSHAKE_AS_SERVER: on = ss->opt.handshakeAsServer; break;
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_TLS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
on = ss->vrange.max >= SSL_LIBRARY_VERSION_TLS_1_0;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_SSL3:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
on = ss->vrange.min == SSL_LIBRARY_VERSION_3_0;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
case SSL_ENABLE_SSL2: on = ss->opt.enableSSL2; break;
|
|
|
|
case SSL_NO_CACHE: on = ss->opt.noCache; break;
|
|
|
|
case SSL_ENABLE_FDX: on = ss->opt.fdx; break;
|
|
|
|
case SSL_V2_COMPATIBLE_HELLO: on = ss->opt.v2CompatibleHello; break;
|
|
|
|
case SSL_ROLLBACK_DETECTION: on = ss->opt.detectRollBack; break;
|
|
|
|
case SSL_NO_STEP_DOWN: on = ss->opt.noStepDown; break;
|
|
|
|
case SSL_BYPASS_PKCS11: on = ss->opt.bypassPKCS11; break;
|
|
|
|
case SSL_NO_LOCKS: on = ss->opt.noLocks; break;
|
|
|
|
case SSL_ENABLE_SESSION_TICKETS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
on = ss->opt.enableSessionTickets;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_DEFLATE: on = ss->opt.enableDeflate; break;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
case SSL_ENABLE_RENEGOTIATION:
|
2018-05-04 16:08:28 +02:00
|
|
|
on = ss->opt.enableRenegotiation; break;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
case SSL_REQUIRE_SAFE_NEGOTIATION:
|
2018-05-04 16:08:28 +02:00
|
|
|
on = ss->opt.requireSafeNegotiation; break;
|
|
|
|
case SSL_ENABLE_FALSE_START: on = ss->opt.enableFalseStart; break;
|
|
|
|
case SSL_CBC_RANDOM_IV: on = ss->opt.cbcRandomIV; break;
|
|
|
|
case SSL_ENABLE_OCSP_STAPLING: on = ss->opt.enableOCSPStapling; break;
|
|
|
|
case SSL_ENABLE_NPN: on = ss->opt.enableNPN; break;
|
|
|
|
case SSL_ENABLE_ALPN: on = ss->opt.enableALPN; break;
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
case SSL_REUSE_SERVER_ECDHE_KEY:
|
|
|
|
on = ss->opt.reuseServerECDHEKey; break;
|
|
|
|
case SSL_ENABLE_FALLBACK_SCSV: on = ss->opt.enableFallbackSCSV; break;
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
case SSL_ENABLE_SERVER_DHE: on = ss->opt.enableServerDhe; break;
|
2020-01-07 08:11:52 +01:00
|
|
|
case SSL_ENABLE_EXTENDED_MASTER_SECRET:
|
|
|
|
on = ss->opt.enableExtendedMS; break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
default:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ssl_ReleaseSSL3HandshakeLock(ss);
|
|
|
|
ssl_Release1stHandshakeLock(ss);
|
|
|
|
|
|
|
|
*pOn = on;
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_OptionGetDefault(PRInt32 which, PRBool *pOn)
|
|
|
|
{
|
|
|
|
SECStatus rv = SECSuccess;
|
|
|
|
PRBool on = PR_FALSE;
|
|
|
|
|
|
|
|
if (!pOn) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
ssl_SetDefaultsFromEnvironment();
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
switch (which) {
|
|
|
|
case SSL_SOCKS: on = PR_FALSE; break;
|
|
|
|
case SSL_SECURITY: on = ssl_defaults.useSecurity; break;
|
|
|
|
case SSL_REQUEST_CERTIFICATE: on = ssl_defaults.requestCertificate; break;
|
|
|
|
case SSL_REQUIRE_CERTIFICATE: on = ssl_defaults.requireCertificate; break;
|
|
|
|
case SSL_HANDSHAKE_AS_CLIENT: on = ssl_defaults.handshakeAsClient; break;
|
|
|
|
case SSL_HANDSHAKE_AS_SERVER: on = ssl_defaults.handshakeAsServer; break;
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_TLS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
on = versions_defaults_stream.max >= SSL_LIBRARY_VERSION_TLS_1_0;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_SSL3:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
on = versions_defaults_stream.min == SSL_LIBRARY_VERSION_3_0;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
case SSL_ENABLE_SSL2: on = ssl_defaults.enableSSL2; break;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
case SSL_NO_CACHE: on = ssl_defaults.noCache; break;
|
2015-10-21 05:03:22 +02:00
|
|
|
case SSL_ENABLE_FDX: on = ssl_defaults.fdx; break;
|
|
|
|
case SSL_V2_COMPATIBLE_HELLO: on = ssl_defaults.v2CompatibleHello; break;
|
|
|
|
case SSL_ROLLBACK_DETECTION: on = ssl_defaults.detectRollBack; break;
|
|
|
|
case SSL_NO_STEP_DOWN: on = ssl_defaults.noStepDown; break;
|
|
|
|
case SSL_BYPASS_PKCS11: on = ssl_defaults.bypassPKCS11; break;
|
|
|
|
case SSL_NO_LOCKS: on = ssl_defaults.noLocks; break;
|
|
|
|
case SSL_ENABLE_SESSION_TICKETS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
on = ssl_defaults.enableSessionTickets;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_DEFLATE: on = ssl_defaults.enableDeflate; break;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
case SSL_ENABLE_RENEGOTIATION:
|
2018-05-04 16:08:28 +02:00
|
|
|
on = ssl_defaults.enableRenegotiation; break;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
case SSL_REQUIRE_SAFE_NEGOTIATION:
|
|
|
|
on = ssl_defaults.requireSafeNegotiation;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_FALSE_START: on = ssl_defaults.enableFalseStart; break;
|
|
|
|
case SSL_CBC_RANDOM_IV: on = ssl_defaults.cbcRandomIV; break;
|
|
|
|
case SSL_ENABLE_OCSP_STAPLING:
|
|
|
|
on = ssl_defaults.enableOCSPStapling;
|
|
|
|
break;
|
|
|
|
case SSL_ENABLE_NPN: on = ssl_defaults.enableNPN; break;
|
|
|
|
case SSL_ENABLE_ALPN: on = ssl_defaults.enableALPN; break;
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
case SSL_REUSE_SERVER_ECDHE_KEY:
|
|
|
|
on = ssl_defaults.reuseServerECDHEKey;
|
|
|
|
break;
|
|
|
|
case SSL_ENABLE_FALLBACK_SCSV:
|
|
|
|
on = ssl_defaults.enableFallbackSCSV;
|
|
|
|
break;
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
case SSL_ENABLE_SERVER_DHE:
|
|
|
|
on = ssl_defaults.enableServerDhe;
|
|
|
|
break;
|
2020-01-07 08:11:52 +01:00
|
|
|
case SSL_ENABLE_EXTENDED_MASTER_SECRET:
|
|
|
|
on = ssl_defaults.enableExtendedMS;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
default:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
rv = SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
*pOn = on;
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX Use Global Lock to protect this stuff. */
|
|
|
|
SECStatus
|
|
|
|
SSL_EnableDefault(int which, PRBool on)
|
|
|
|
{
|
|
|
|
return SSL_OptionSetDefault(which, on);
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_OptionSetDefault(PRInt32 which, PRBool on)
|
|
|
|
{
|
2018-05-04 16:08:28 +02:00
|
|
|
SECStatus status = ssl_Init();
|
|
|
|
|
|
|
|
if (status != SECSuccess) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return status;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ssl_SetDefaultsFromEnvironment();
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
switch (which) {
|
|
|
|
case SSL_SOCKS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.useSocks = PR_FALSE;
|
|
|
|
if (on) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_SECURITY:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.useSecurity = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_REQUEST_CERTIFICATE:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.requestCertificate = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_REQUIRE_CERTIFICATE:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.requireCertificate = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_HANDSHAKE_AS_CLIENT:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if ( ssl_defaults.handshakeAsServer && on ) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
ssl_defaults.handshakeAsClient = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_HANDSHAKE_AS_SERVER:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if ( ssl_defaults.handshakeAsClient && on ) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
ssl_defaults.handshakeAsServer = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_TLS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_EnableTLS(&versions_defaults_stream, on);
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_SSL3:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_EnableSSL3(&versions_defaults_stream, on);
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_SSL2:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.enableSSL2 = on;
|
|
|
|
if (on) {
|
|
|
|
ssl_defaults.v2CompatibleHello = on;
|
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_NO_CACHE:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.noCache = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_FDX:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on && ssl_defaults.noLocks) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
ssl_defaults.fdx = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_V2_COMPATIBLE_HELLO:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.v2CompatibleHello = on;
|
|
|
|
if (!on) {
|
|
|
|
ssl_defaults.enableSSL2 = on;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_ROLLBACK_DETECTION:
|
|
|
|
ssl_defaults.detectRollBack = on;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_NO_STEP_DOWN:
|
|
|
|
ssl_defaults.noStepDown = on;
|
|
|
|
if (on)
|
|
|
|
SSL_DisableDefaultExportCipherSuites();
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_BYPASS_PKCS11:
|
|
|
|
if (PR_FALSE != on) {
|
|
|
|
if (PR_SUCCESS == SSL_BypassSetup()) {
|
2018-05-04 16:08:28 +02:00
|
|
|
#ifdef NO_PKCS11_BYPASS
|
|
|
|
ssl_defaults.bypassPKCS11 = PR_FALSE;
|
|
|
|
#else
|
2015-10-21 05:03:22 +02:00
|
|
|
ssl_defaults.bypassPKCS11 = on;
|
2018-05-04 16:08:28 +02:00
|
|
|
#endif
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ssl_defaults.bypassPKCS11 = PR_FALSE;
|
|
|
|
}
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_NO_LOCKS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (on && ssl_defaults.fdx) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
if (on && ssl_force_locks)
|
|
|
|
on = PR_FALSE; /* silent override */
|
|
|
|
ssl_defaults.noLocks = on;
|
|
|
|
if (on) {
|
|
|
|
locksEverDisabled = PR_TRUE;
|
|
|
|
strcpy(lockStatus + LOCKSTATUS_OFFSET, "DISABLED.");
|
|
|
|
}
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_SESSION_TICKETS:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.enableSessionTickets = on;
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
case SSL_ENABLE_DEFLATE:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.enableDeflate = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_RENEGOTIATION:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.enableRenegotiation = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_REQUIRE_SAFE_NEGOTIATION:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.requireSafeNegotiation = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_FALSE_START:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.enableFalseStart = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_CBC_RANDOM_IV:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.cbcRandomIV = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_OCSP_STAPLING:
|
|
|
|
ssl_defaults.enableOCSPStapling = on;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_ENABLE_NPN:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.enableNPN = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
case SSL_ENABLE_ALPN:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_defaults.enableALPN = on;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
case SSL_REUSE_SERVER_ECDHE_KEY:
|
|
|
|
ssl_defaults.reuseServerECDHEKey = on;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_ENABLE_FALLBACK_SCSV:
|
|
|
|
ssl_defaults.enableFallbackSCSV = on;
|
|
|
|
break;
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
case SSL_ENABLE_SERVER_DHE:
|
|
|
|
ssl_defaults.enableServerDhe = on;
|
|
|
|
break;
|
|
|
|
|
2020-01-07 08:11:52 +01:00
|
|
|
case SSL_ENABLE_EXTENDED_MASTER_SECRET:
|
|
|
|
ssl_defaults.enableExtendedMS = on;
|
|
|
|
break;
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
default:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* function tells us if the cipher suite is one that we no longer support. */
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
static PRBool
|
2015-10-21 05:03:22 +02:00
|
|
|
ssl_IsRemovedCipherSuite(PRInt32 suite)
|
|
|
|
{
|
|
|
|
switch (suite) {
|
|
|
|
case SSL_FORTEZZA_DMS_WITH_NULL_SHA:
|
|
|
|
case SSL_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA:
|
|
|
|
case SSL_FORTEZZA_DMS_WITH_RC4_128_SHA:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return PR_TRUE;
|
2015-10-21 05:03:22 +02:00
|
|
|
default:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return PR_FALSE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Part of the public NSS API.
|
|
|
|
* Since this is a global (not per-socket) setting, we cannot use the
|
|
|
|
* HandshakeLock to protect this. Probably want a global lock.
|
|
|
|
*/
|
|
|
|
SECStatus
|
|
|
|
SSL_SetPolicy(long which, int policy)
|
|
|
|
{
|
|
|
|
if ((which & 0xfffe) == SSL_RSA_OLDFIPS_WITH_3DES_EDE_CBC_SHA) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* one of the two old FIPS ciphers */
|
|
|
|
if (which == SSL_RSA_OLDFIPS_WITH_3DES_EDE_CBC_SHA)
|
|
|
|
which = SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA;
|
|
|
|
else if (which == SSL_RSA_OLDFIPS_WITH_DES_CBC_SHA)
|
|
|
|
which = SSL_RSA_FIPS_WITH_DES_CBC_SHA;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ssl_IsRemovedCipherSuite(which))
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return SECSuccess;
|
2015-10-21 05:03:22 +02:00
|
|
|
return SSL_CipherPolicySet(which, policy);
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_CipherPolicySet(PRInt32 which, PRInt32 policy)
|
|
|
|
{
|
2018-05-04 16:08:28 +02:00
|
|
|
SECStatus rv = ssl_Init();
|
|
|
|
|
|
|
|
if (rv != SECSuccess) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return rv;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
if (ssl_IsRemovedCipherSuite(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = SECSuccess;
|
2015-10-21 05:03:22 +02:00
|
|
|
} else if (SSL_IS_SSL2_CIPHER(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl2_SetPolicy(which, policy);
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl3_SetPolicy((ssl3CipherSuite)which, policy);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_CipherPolicyGet(PRInt32 which, PRInt32 *oPolicy)
|
|
|
|
{
|
|
|
|
SECStatus rv;
|
|
|
|
|
|
|
|
if (!oPolicy) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ssl_IsRemovedCipherSuite(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
*oPolicy = SSL_NOT_ALLOWED;
|
|
|
|
rv = SECSuccess;
|
2015-10-21 05:03:22 +02:00
|
|
|
} else if (SSL_IS_SSL2_CIPHER(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl2_GetPolicy(which, oPolicy);
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl3_GetPolicy((ssl3CipherSuite)which, oPolicy);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Part of the public NSS API.
|
|
|
|
* Since this is a global (not per-socket) setting, we cannot use the
|
|
|
|
* HandshakeLock to protect this. Probably want a global lock.
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
* These changes have no effect on any sslSockets already created.
|
2015-10-21 05:03:22 +02:00
|
|
|
*/
|
|
|
|
SECStatus
|
|
|
|
SSL_EnableCipher(long which, PRBool enabled)
|
|
|
|
{
|
|
|
|
if ((which & 0xfffe) == SSL_RSA_OLDFIPS_WITH_3DES_EDE_CBC_SHA) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* one of the two old FIPS ciphers */
|
|
|
|
if (which == SSL_RSA_OLDFIPS_WITH_3DES_EDE_CBC_SHA)
|
|
|
|
which = SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA;
|
|
|
|
else if (which == SSL_RSA_OLDFIPS_WITH_DES_CBC_SHA)
|
|
|
|
which = SSL_RSA_FIPS_WITH_DES_CBC_SHA;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ssl_IsRemovedCipherSuite(which))
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return SECSuccess;
|
2015-10-21 05:03:22 +02:00
|
|
|
return SSL_CipherPrefSetDefault(which, enabled);
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_CipherPrefSetDefault(PRInt32 which, PRBool enabled)
|
|
|
|
{
|
2018-05-04 16:08:28 +02:00
|
|
|
SECStatus rv = ssl_Init();
|
|
|
|
|
|
|
|
if (rv != SECSuccess) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return rv;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
if (ssl_IsRemovedCipherSuite(which))
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return SECSuccess;
|
2015-10-21 05:03:22 +02:00
|
|
|
if (enabled && ssl_defaults.noStepDown && SSL_IsExportCipherSuite(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (SSL_IS_SSL2_CIPHER(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl2_CipherPrefSetDefault(which, enabled);
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl3_CipherPrefSetDefault((ssl3CipherSuite)which, enabled);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SECStatus
|
2015-10-21 05:03:22 +02:00
|
|
|
SSL_CipherPrefGetDefault(PRInt32 which, PRBool *enabled)
|
|
|
|
{
|
|
|
|
SECStatus rv;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
if (!enabled) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ssl_IsRemovedCipherSuite(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
*enabled = PR_FALSE;
|
|
|
|
rv = SECSuccess;
|
2015-10-21 05:03:22 +02:00
|
|
|
} else if (SSL_IS_SSL2_CIPHER(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl2_CipherPrefGetDefault(which, enabled);
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl3_CipherPrefGetDefault((ssl3CipherSuite)which, enabled);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_CipherPrefSet(PRFileDesc *fd, PRInt32 which, PRBool enabled)
|
|
|
|
{
|
|
|
|
SECStatus rv;
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in CipherPrefSet", SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ssl_IsRemovedCipherSuite(which))
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return SECSuccess;
|
2015-10-21 05:03:22 +02:00
|
|
|
if (enabled && ss->opt.noStepDown && SSL_IsExportCipherSuite(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (SSL_IS_SSL2_CIPHER(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl2_CipherPrefSet(ss, which, enabled);
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl3_CipherPrefSet(ss, (ssl3CipherSuite)which, enabled);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SECStatus
|
2015-10-21 05:03:22 +02:00
|
|
|
SSL_CipherPrefGet(PRFileDesc *fd, PRInt32 which, PRBool *enabled)
|
|
|
|
{
|
|
|
|
SECStatus rv;
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
if (!enabled) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in CipherPrefGet", SSL_GETPID(), fd));
|
|
|
|
*enabled = PR_FALSE;
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ssl_IsRemovedCipherSuite(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
*enabled = PR_FALSE;
|
|
|
|
rv = SECSuccess;
|
2015-10-21 05:03:22 +02:00
|
|
|
} else if (SSL_IS_SSL2_CIPHER(which)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl2_CipherPrefGet(ss, which, enabled);
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl3_CipherPrefGet(ss, (ssl3CipherSuite)which, enabled);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
NSS_SetDomesticPolicy(void)
|
|
|
|
{
|
|
|
|
SECStatus status = SECSuccess;
|
2018-05-04 16:08:28 +02:00
|
|
|
const PRUint16 *cipher;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
for (cipher = SSL_ImplementedCiphers; *cipher != 0; ++cipher) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
status = SSL_SetPolicy(*cipher, SSL_ALLOWED);
|
|
|
|
if (status != SECSuccess)
|
|
|
|
break;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
NSS_SetExportPolicy(void)
|
|
|
|
{
|
2018-05-04 16:08:28 +02:00
|
|
|
return NSS_SetDomesticPolicy();
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
NSS_SetFrancePolicy(void)
|
|
|
|
{
|
2018-05-04 16:08:28 +02:00
|
|
|
return NSS_SetDomesticPolicy();
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
SECStatus
|
|
|
|
SSL_DHEGroupPrefSet(PRFileDesc *fd,
|
|
|
|
SSLDHEGroupType *groups,
|
|
|
|
PRUint16 num_groups)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
|
|
|
|
if ((num_groups && !groups) || (!num_groups && groups)) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
ss = ssl_FindSocket(fd);
|
|
|
|
if (!ss) {
|
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_DHEGroupPrefSet", SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ss->ssl3.dheGroups) {
|
|
|
|
PORT_Free(ss->ssl3.dheGroups);
|
|
|
|
ss->ssl3.dheGroups = NULL;
|
|
|
|
ss->ssl3.numDHEGroups = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (groups) {
|
|
|
|
ss->ssl3.dheGroups = PORT_NewArray(SSLDHEGroupType, num_groups);
|
|
|
|
if (!ss->ssl3.dheGroups) {
|
|
|
|
PORT_SetError(SEC_ERROR_NO_MEMORY);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
PORT_Memcpy(ss->ssl3.dheGroups, groups,
|
|
|
|
sizeof(SSLDHEGroupType) * num_groups);
|
|
|
|
}
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PRCallOnceType gWeakDHParamsRegisterOnce;
|
|
|
|
int gWeakDHParamsRegisterError;
|
|
|
|
|
|
|
|
PRCallOnceType gWeakDHParamsOnce;
|
|
|
|
int gWeakDHParamsError;
|
|
|
|
/* As our code allocates type PQGParams, we'll keep it around,
|
|
|
|
* even though we only make use of it's parameters through gWeakDHParam. */
|
|
|
|
static PQGParams *gWeakParamsPQG;
|
|
|
|
static ssl3DHParams *gWeakDHParams;
|
|
|
|
|
|
|
|
static PRStatus
|
|
|
|
ssl3_CreateWeakDHParams(void)
|
|
|
|
{
|
|
|
|
PQGVerify *vfy;
|
|
|
|
SECStatus rv, passed;
|
|
|
|
|
|
|
|
PORT_Assert(!gWeakDHParams && !gWeakParamsPQG);
|
|
|
|
|
|
|
|
rv = PK11_PQG_ParamGenV2(1024, 160, 64 /*maximum seed that will work*/,
|
|
|
|
&gWeakParamsPQG, &vfy);
|
|
|
|
if (rv != SECSuccess) {
|
|
|
|
gWeakDHParamsError = PORT_GetError();
|
|
|
|
return PR_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
rv = PK11_PQG_VerifyParams(gWeakParamsPQG, vfy, &passed);
|
|
|
|
if (rv != SECSuccess || passed != SECSuccess) {
|
|
|
|
SSL_DBG(("%d: PK11_PQG_VerifyParams failed in ssl3_CreateWeakDHParams",
|
|
|
|
SSL_GETPID()));
|
|
|
|
gWeakDHParamsError = PORT_GetError();
|
|
|
|
return PR_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
gWeakDHParams = PORT_ArenaNew(gWeakParamsPQG->arena, ssl3DHParams);
|
|
|
|
if (!gWeakDHParams) {
|
|
|
|
gWeakDHParamsError = PORT_GetError();
|
|
|
|
return PR_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
gWeakDHParams->prime.data = gWeakParamsPQG->prime.data;
|
|
|
|
gWeakDHParams->prime.len = gWeakParamsPQG->prime.len;
|
|
|
|
gWeakDHParams->base.data = gWeakParamsPQG->base.data;
|
|
|
|
gWeakDHParams->base.len = gWeakParamsPQG->base.len;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
PK11_PQG_DestroyVerify(vfy);
|
|
|
|
return PR_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static SECStatus
|
|
|
|
ssl3_WeakDHParamsShutdown(void *appData, void *nssData)
|
|
|
|
{
|
|
|
|
if (gWeakParamsPQG) {
|
|
|
|
PK11_PQG_DestroyParams(gWeakParamsPQG);
|
|
|
|
gWeakParamsPQG = NULL;
|
|
|
|
gWeakDHParams = NULL;
|
|
|
|
}
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus
|
|
|
|
ssl3_WeakDHParamsRegisterShutdown(void)
|
|
|
|
{
|
|
|
|
SECStatus rv;
|
|
|
|
rv = NSS_RegisterShutdown(ssl3_WeakDHParamsShutdown, NULL);
|
|
|
|
if (rv != SECSuccess) {
|
|
|
|
gWeakDHParamsRegisterError = PORT_GetError();
|
|
|
|
}
|
|
|
|
return (PRStatus)rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* global init strategy inspired by ssl3_CreateECDHEphemeralKeys */
|
|
|
|
SECStatus
|
|
|
|
SSL_EnableWeakDHEPrimeGroup(PRFileDesc *fd, PRBool enabled)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
PRStatus status;
|
|
|
|
|
|
|
|
if (enabled) {
|
|
|
|
status = PR_CallOnce(&gWeakDHParamsRegisterOnce,
|
|
|
|
ssl3_WeakDHParamsRegisterShutdown);
|
|
|
|
if (status != PR_SUCCESS) {
|
|
|
|
PORT_SetError(gWeakDHParamsRegisterError);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
status = PR_CallOnce(&gWeakDHParamsOnce, ssl3_CreateWeakDHParams);
|
|
|
|
if (status != PR_SUCCESS) {
|
|
|
|
PORT_SetError(gWeakDHParamsError);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!fd)
|
|
|
|
return SECSuccess;
|
|
|
|
|
|
|
|
ss = ssl_FindSocket(fd);
|
|
|
|
if (!ss) {
|
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_DHEGroupPrefSet", SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
ss->ssl3.dheWeakGroupEnabled = enabled;
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
#include "dhe-param.c"
|
|
|
|
|
|
|
|
static const SSLDHEGroupType ssl_default_dhe_groups[] = {
|
|
|
|
ssl_ff_dhe_2048_group
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Keep this array synchronized with the index definitions in SSLDHEGroupType */
|
|
|
|
static const ssl3DHParams *all_ssl3DHParams[] = {
|
|
|
|
NULL, /* ssl_dhe_group_none */
|
|
|
|
&ff_dhe_2048,
|
|
|
|
&ff_dhe_3072,
|
|
|
|
&ff_dhe_4096,
|
|
|
|
&ff_dhe_6144,
|
|
|
|
&ff_dhe_8192,
|
|
|
|
};
|
|
|
|
|
|
|
|
static SSLDHEGroupType
|
|
|
|
selectDHEGroup(sslSocket *ss, const SSLDHEGroupType *groups, PRUint16 num_groups)
|
|
|
|
{
|
|
|
|
if (!groups || !num_groups)
|
|
|
|
return ssl_dhe_group_none;
|
|
|
|
|
|
|
|
/* We don't have automatic group parameter selection yet
|
|
|
|
* (potentially) based on socket parameters, e.g. key sizes.
|
|
|
|
* For now, we return the first available group from the allowed list. */
|
|
|
|
return groups[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ensure DH parameters have been selected */
|
|
|
|
SECStatus
|
|
|
|
ssl3_SelectDHParams(sslSocket *ss)
|
|
|
|
{
|
|
|
|
SSLDHEGroupType selectedGroup = ssl_dhe_group_none;
|
|
|
|
|
|
|
|
if (ss->ssl3.dheWeakGroupEnabled) {
|
|
|
|
ss->dheParams = gWeakDHParams;
|
|
|
|
} else {
|
|
|
|
if (ss->ssl3.dheGroups) {
|
|
|
|
selectedGroup = selectDHEGroup(ss, ss->ssl3.dheGroups,
|
|
|
|
ss->ssl3.numDHEGroups);
|
|
|
|
} else {
|
|
|
|
size_t number_of_default_groups = PR_ARRAY_SIZE(ssl_default_dhe_groups);
|
|
|
|
selectedGroup = selectDHEGroup(ss, ssl_default_dhe_groups,
|
|
|
|
number_of_default_groups);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (selectedGroup == ssl_dhe_group_none ||
|
|
|
|
selectedGroup >= ssl_dhe_group_max) {
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
ss->dheParams = all_ssl3DHParams[selectedGroup];
|
|
|
|
}
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
/* LOCKS ??? XXX */
|
2018-05-04 16:08:28 +02:00
|
|
|
static PRFileDesc *
|
|
|
|
ssl_ImportFD(PRFileDesc *model, PRFileDesc *fd, SSLProtocolVariant variant)
|
2015-10-21 05:03:22 +02:00
|
|
|
{
|
|
|
|
sslSocket * ns = NULL;
|
|
|
|
PRStatus rv;
|
|
|
|
PRNetAddr addr;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SECStatus status = ssl_Init();
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
if (status != SECSuccess) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return NULL;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
if (model == NULL) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* Just create a default socket if we're given NULL for the model */
|
|
|
|
ns = ssl_NewSocket((PRBool)(!ssl_defaults.noLocks), variant);
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
sslSocket * ss = ssl_FindSocket(model);
|
|
|
|
if (ss == NULL || ss->protocolVariant != variant) {
|
|
|
|
SSL_DBG(("%d: SSL[%d]: bad model socket in ssl_ImportFD",
|
|
|
|
SSL_GETPID(), model));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ns = ssl_DupSocket(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (ns == NULL)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
rv = ssl_PushIOLayer(ns, fd, PR_TOP_IO_LAYER);
|
|
|
|
if (rv != PR_SUCCESS) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_FreeSocket(ns);
|
|
|
|
SET_ERROR_CODE
|
|
|
|
return NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
cherry-picked mozilla NSS upstream changes (to rev f7a4c771997e, which is on par with 3.16.1 but without windows rand() changes):
9934c8faef29, 3c3b381c4865, 5a67f6beee9a, 1b1eb6d77728, a8b668fd72f7, bug962760, bug743700, bug857304, bug972653, bug972450, bug971358, bug903885, bug977073, bug976111, bug949939, bug947653, bug947572, bug903885, bug979106, bug966596, bug979004, bug979752, bug980848, bug938369, bug981170, bug668130, bug974693, bug975056, bug979132, bug370717, bug979070, bug985070, bug900067, bug977673, bug519255, bug989558, bug557299, bug987263, bug369802, a751a5146718, bug992343, bug952572, bug979703, bug994883, bug994869, bug993489, bug984608, bug977869, bug667371, bug672828, bug793347, bug977869
2018-07-10 17:07:31 +02:00
|
|
|
#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
|
|
|
|
{
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
sslSocket * ss = ssl_FindSocket(fd);
|
|
|
|
PORT_Assert(ss == ns);
|
cherry-picked mozilla NSS upstream changes (to rev f7a4c771997e, which is on par with 3.16.1 but without windows rand() changes):
9934c8faef29, 3c3b381c4865, 5a67f6beee9a, 1b1eb6d77728, a8b668fd72f7, bug962760, bug743700, bug857304, bug972653, bug972450, bug971358, bug903885, bug977073, bug976111, bug949939, bug947653, bug947572, bug903885, bug979106, bug966596, bug979004, bug979752, bug980848, bug938369, bug981170, bug668130, bug974693, bug975056, bug979132, bug370717, bug979070, bug985070, bug900067, bug977673, bug519255, bug989558, bug557299, bug987263, bug369802, a751a5146718, bug992343, bug952572, bug979703, bug994883, bug994869, bug993489, bug984608, bug977869, bug667371, bug672828, bug793347, bug977869
2018-07-10 17:07:31 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
ns->TCPconnected = (PR_SUCCESS == ssl_DefGetpeername(ns, &addr));
|
2015-10-21 05:03:22 +02:00
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
PRFileDesc *
|
|
|
|
SSL_ImportFD(PRFileDesc *model, PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
return ssl_ImportFD(model, fd, ssl_variant_stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
PRFileDesc *
|
|
|
|
DTLS_ImportFD(PRFileDesc *model, PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
return ssl_ImportFD(model, fd, ssl_variant_datagram);
|
|
|
|
}
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* SSL_SetNextProtoCallback is used to select an application protocol
|
|
|
|
* for ALPN and NPN. For ALPN, this runs on the server; for NPN it
|
|
|
|
* runs on the client. */
|
|
|
|
/* Note: The ALPN version doesn't allow for the use of a default, setting a
|
|
|
|
* status of SSL_NEXT_PROTO_NO_OVERLAP is treated as a failure. */
|
2018-05-04 16:08:28 +02:00
|
|
|
SECStatus
|
|
|
|
SSL_SetNextProtoCallback(PRFileDesc *fd, SSLNextProtoCallback callback,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
void *arg)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetNextProtoCallback", SSL_GETPID(),
|
|
|
|
fd));
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ssl_GetSSL3HandshakeLock(ss);
|
|
|
|
ss->nextProtoCallback = callback;
|
|
|
|
ss->nextProtoArg = arg;
|
|
|
|
ssl_ReleaseSSL3HandshakeLock(ss);
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* ssl_NextProtoNegoCallback is set as an ALPN/NPN callback when
|
2018-05-04 16:08:28 +02:00
|
|
|
* SSL_SetNextProtoNego is used.
|
|
|
|
*/
|
|
|
|
static SECStatus
|
|
|
|
ssl_NextProtoNegoCallback(void *arg, PRFileDesc *fd,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
const unsigned char *protos, unsigned int protos_len,
|
|
|
|
unsigned char *protoOut, unsigned int *protoOutLen,
|
|
|
|
unsigned int protoMaxLen)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
unsigned int i, j;
|
|
|
|
const unsigned char *result;
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in ssl_NextProtoNegoCallback",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* For each protocol in server preference, see if we support it. */
|
|
|
|
for (i = 0; i < protos_len; ) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
for (j = 0; j < ss->opt.nextProtoNego.len; ) {
|
|
|
|
if (protos[i] == ss->opt.nextProtoNego.data[j] &&
|
|
|
|
PORT_Memcmp(&protos[i+1], &ss->opt.nextProtoNego.data[j+1],
|
|
|
|
protos[i]) == 0) {
|
|
|
|
/* We found a match. */
|
|
|
|
ss->ssl3.nextProtoState = SSL_NEXT_PROTO_NEGOTIATED;
|
|
|
|
result = &protos[i];
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
j += 1 + (unsigned int)ss->opt.nextProtoNego.data[j];
|
|
|
|
}
|
|
|
|
i += 1 + (unsigned int)protos[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The other side supports the extension, and either doesn't have any
|
|
|
|
* protocols configured, or none of its options match ours. In this case we
|
|
|
|
* request our favoured protocol. */
|
|
|
|
/* This will be treated as a failure for ALPN. */
|
2018-05-04 16:08:28 +02:00
|
|
|
ss->ssl3.nextProtoState = SSL_NEXT_PROTO_NO_OVERLAP;
|
|
|
|
result = ss->opt.nextProtoNego.data;
|
|
|
|
|
|
|
|
found:
|
|
|
|
if (protoMaxLen < result[0]) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_OUTPUT_LEN);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
memcpy(protoOut, result + 1, result[0]);
|
|
|
|
*protoOutLen = result[0];
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_SetNextProtoNego(PRFileDesc *fd, const unsigned char *data,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
unsigned int length)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
SECStatus rv;
|
|
|
|
SECItem dataItem = { siBuffer, (unsigned char *) data, length };
|
|
|
|
|
|
|
|
ss = ssl_FindSocket(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetNextProtoNego",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ssl3_ValidateNextProtoNego(data, length) != SECSuccess)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
ssl_GetSSL3HandshakeLock(ss);
|
|
|
|
SECITEM_FreeItem(&ss->opt.nextProtoNego, PR_FALSE);
|
|
|
|
rv = SECITEM_CopyItem(NULL, &ss->opt.nextProtoNego, &dataItem);
|
|
|
|
ssl_ReleaseSSL3HandshakeLock(ss);
|
|
|
|
|
|
|
|
if (rv != SECSuccess)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return rv;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
return SSL_SetNextProtoCallback(fd, ssl_NextProtoNegoCallback, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_GetNextProto(PRFileDesc *fd, SSLNextProtoState *state, unsigned char *buf,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
unsigned int *bufLen, unsigned int bufLenMax)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_GetNextProto", SSL_GETPID(),
|
|
|
|
fd));
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!state || !buf || !bufLen) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
*state = ss->ssl3.nextProtoState;
|
|
|
|
|
|
|
|
if (ss->ssl3.nextProtoState != SSL_NEXT_PROTO_NO_SUPPORT &&
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->ssl3.nextProto.data) {
|
|
|
|
if (ss->ssl3.nextProto.len > bufLenMax) {
|
|
|
|
PORT_SetError(SEC_ERROR_OUTPUT_LEN);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
PORT_Memcpy(buf, ss->ssl3.nextProto.data, ss->ssl3.nextProto.len);
|
|
|
|
*bufLen = ss->ssl3.nextProto.len;
|
2018-05-04 16:08:28 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
*bufLen = 0;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus SSL_SetSRTPCiphers(PRFileDesc *fd,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
const PRUint16 *ciphers,
|
|
|
|
unsigned int numCiphers)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
ss = ssl_FindSocket(fd);
|
|
|
|
if (!ss || !IS_DTLS(ss)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetSRTPCiphers",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (numCiphers > MAX_DTLS_SRTP_CIPHER_SUITES) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ss->ssl3.dtlsSRTPCipherCount = 0;
|
|
|
|
for (i = 0; i < numCiphers; i++) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
const PRUint16 *srtpCipher = srtpCiphers;
|
|
|
|
|
|
|
|
while (*srtpCipher) {
|
|
|
|
if (ciphers[i] == *srtpCipher)
|
|
|
|
break;
|
|
|
|
srtpCipher++;
|
|
|
|
}
|
|
|
|
if (*srtpCipher) {
|
|
|
|
ss->ssl3.dtlsSRTPCiphers[ss->ssl3.dtlsSRTPCipherCount++] =
|
|
|
|
ciphers[i];
|
|
|
|
} else {
|
|
|
|
SSL_DBG(("%d: SSL[%d]: invalid or unimplemented SRTP cipher "
|
|
|
|
"suite specified: 0x%04hx", SSL_GETPID(), fd,
|
|
|
|
ciphers[i]));
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ss->ssl3.dtlsSRTPCipherCount == 0) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_GetSRTPCipher(PRFileDesc *fd, PRUint16 *cipher)
|
|
|
|
{
|
|
|
|
sslSocket * ss;
|
|
|
|
|
|
|
|
ss = ssl_FindSocket(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_GetSRTPCipher",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!ss->ssl3.dtlsSRTPCipherSuite) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
*cipher = ss->ssl3.dtlsSRTPCipherSuite;
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
PRFileDesc *
|
|
|
|
SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
sslSocket * sm = NULL, *ss = NULL;
|
|
|
|
int i;
|
|
|
|
sslServerCerts * mc = NULL;
|
|
|
|
sslServerCerts * sc = NULL;
|
|
|
|
|
|
|
|
if (model == NULL) {
|
|
|
|
PR_SetError(SEC_ERROR_INVALID_ARGS, 0);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
sm = ssl_FindSocket(model);
|
|
|
|
if (sm == NULL) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad model socket in ssl_ReconfigFD",
|
2018-05-04 16:08:28 +02:00
|
|
|
SSL_GETPID(), model));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ss = ssl_FindSocket(fd);
|
|
|
|
PORT_Assert(ss);
|
|
|
|
if (ss == NULL) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return NULL;
|
|
|
|
}
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
ss->opt = sm->opt;
|
|
|
|
ss->vrange = sm->vrange;
|
|
|
|
PORT_Memcpy(ss->cipherSuites, sm->cipherSuites, sizeof sm->cipherSuites);
|
|
|
|
PORT_Memcpy(ss->ssl3.dtlsSRTPCiphers, sm->ssl3.dtlsSRTPCiphers,
|
|
|
|
sizeof(PRUint16) * sm->ssl3.dtlsSRTPCipherCount);
|
|
|
|
ss->ssl3.dtlsSRTPCipherCount = sm->ssl3.dtlsSRTPCipherCount;
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
PORT_Memcpy(ss->ssl3.signatureAlgorithms, sm->ssl3.signatureAlgorithms,
|
|
|
|
sizeof(ss->ssl3.signatureAlgorithms[0]) *
|
|
|
|
sm->ssl3.signatureAlgorithmCount);
|
|
|
|
ss->ssl3.signatureAlgorithmCount = sm->ssl3.signatureAlgorithmCount;
|
2018-05-04 16:08:28 +02:00
|
|
|
|
|
|
|
if (!ss->opt.useSecurity) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* This int should be SSLKEAType, but CC on Irix complains,
|
|
|
|
* during the for loop.
|
|
|
|
*/
|
|
|
|
for (i=kt_null; i < kt_kea_size; i++) {
|
|
|
|
mc = &(sm->serverCerts[i]);
|
|
|
|
sc = &(ss->serverCerts[i]);
|
|
|
|
if (mc->serverCert && mc->serverCertChain) {
|
|
|
|
if (sc->serverCert) {
|
|
|
|
CERT_DestroyCertificate(sc->serverCert);
|
|
|
|
}
|
|
|
|
sc->serverCert = CERT_DupCertificate(mc->serverCert);
|
|
|
|
if (sc->serverCertChain) {
|
|
|
|
CERT_DestroyCertificateList(sc->serverCertChain);
|
|
|
|
}
|
|
|
|
sc->serverCertChain = CERT_DupCertList(mc->serverCertChain);
|
|
|
|
if (!sc->serverCertChain)
|
|
|
|
goto loser;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (sm->certStatusArray[i]) {
|
|
|
|
if (ss->certStatusArray[i]) {
|
|
|
|
SECITEM_FreeArray(ss->certStatusArray[i], PR_TRUE);
|
|
|
|
ss->certStatusArray[i] = NULL;
|
|
|
|
}
|
|
|
|
ss->certStatusArray[i] = SECITEM_DupArray(NULL, sm->certStatusArray[i]);
|
|
|
|
if (!ss->certStatusArray[i])
|
|
|
|
goto loser;
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
if (mc->serverKeyPair) {
|
|
|
|
if (sc->serverKeyPair) {
|
|
|
|
ssl3_FreeKeyPair(sc->serverKeyPair);
|
|
|
|
}
|
|
|
|
sc->serverKeyPair = ssl3_GetKeyPairRef(mc->serverKeyPair);
|
|
|
|
sc->serverKeyBits = mc->serverKeyBits;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (sm->stepDownKeyPair) {
|
|
|
|
if (ss->stepDownKeyPair) {
|
|
|
|
ssl3_FreeKeyPair(ss->stepDownKeyPair);
|
|
|
|
}
|
|
|
|
ss->stepDownKeyPair = ssl3_GetKeyPairRef(sm->stepDownKeyPair);
|
|
|
|
}
|
|
|
|
if (sm->ephemeralECDHKeyPair) {
|
|
|
|
if (ss->ephemeralECDHKeyPair) {
|
|
|
|
ssl3_FreeKeyPair(ss->ephemeralECDHKeyPair);
|
|
|
|
}
|
|
|
|
ss->ephemeralECDHKeyPair =
|
|
|
|
ssl3_GetKeyPairRef(sm->ephemeralECDHKeyPair);
|
|
|
|
}
|
|
|
|
/* copy trust anchor names */
|
|
|
|
if (sm->ssl3.ca_list) {
|
|
|
|
if (ss->ssl3.ca_list) {
|
|
|
|
CERT_FreeDistNames(ss->ssl3.ca_list);
|
|
|
|
}
|
|
|
|
ss->ssl3.ca_list = CERT_DupDistNames(sm->ssl3.ca_list);
|
|
|
|
if (!ss->ssl3.ca_list) {
|
|
|
|
goto loser;
|
|
|
|
}
|
|
|
|
}
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
if (sm->authCertificate)
|
|
|
|
ss->authCertificate = sm->authCertificate;
|
|
|
|
if (sm->authCertificateArg)
|
|
|
|
ss->authCertificateArg = sm->authCertificateArg;
|
|
|
|
if (sm->getClientAuthData)
|
|
|
|
ss->getClientAuthData = sm->getClientAuthData;
|
|
|
|
if (sm->getClientAuthDataArg)
|
|
|
|
ss->getClientAuthDataArg = sm->getClientAuthDataArg;
|
|
|
|
if (sm->sniSocketConfig)
|
|
|
|
ss->sniSocketConfig = sm->sniSocketConfig;
|
|
|
|
if (sm->sniSocketConfigArg)
|
|
|
|
ss->sniSocketConfigArg = sm->sniSocketConfigArg;
|
|
|
|
if (sm->handleBadCert)
|
|
|
|
ss->handleBadCert = sm->handleBadCert;
|
|
|
|
if (sm->badCertArg)
|
|
|
|
ss->badCertArg = sm->badCertArg;
|
|
|
|
if (sm->handshakeCallback)
|
|
|
|
ss->handshakeCallback = sm->handshakeCallback;
|
|
|
|
if (sm->handshakeCallbackData)
|
|
|
|
ss->handshakeCallbackData = sm->handshakeCallbackData;
|
|
|
|
if (sm->pkcs11PinArg)
|
|
|
|
ss->pkcs11PinArg = sm->pkcs11PinArg;
|
|
|
|
return fd;
|
|
|
|
loser:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PRBool
|
|
|
|
ssl3_VersionIsSupported(SSLProtocolVariant protocolVariant,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL3ProtocolVersion version)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
switch (protocolVariant) {
|
|
|
|
case ssl_variant_stream:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return (version >= SSL_LIBRARY_VERSION_3_0 &&
|
|
|
|
version <= SSL_LIBRARY_VERSION_MAX_SUPPORTED);
|
2018-05-04 16:08:28 +02:00
|
|
|
case ssl_variant_datagram:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return (version >= SSL_LIBRARY_VERSION_TLS_1_1 &&
|
|
|
|
version <= SSL_LIBRARY_VERSION_MAX_SUPPORTED);
|
2018-05-04 16:08:28 +02:00
|
|
|
default:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* Can't get here */
|
|
|
|
PORT_Assert(PR_FALSE);
|
|
|
|
return PR_FALSE;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns PR_TRUE if the given version range is valid and
|
|
|
|
** fully supported; otherwise, returns PR_FALSE.
|
|
|
|
*/
|
|
|
|
static PRBool
|
|
|
|
ssl3_VersionRangeIsValid(SSLProtocolVariant protocolVariant,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
const SSLVersionRange *vrange)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
return vrange &&
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
vrange->min <= vrange->max &&
|
|
|
|
ssl3_VersionIsSupported(protocolVariant, vrange->min) &&
|
|
|
|
ssl3_VersionIsSupported(protocolVariant, vrange->max);
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_VersionRangeGetSupported(SSLProtocolVariant protocolVariant,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSLVersionRange *vrange)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
if (!vrange) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (protocolVariant) {
|
|
|
|
case ssl_variant_stream:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
vrange->min = SSL_LIBRARY_VERSION_3_0;
|
|
|
|
vrange->max = SSL_LIBRARY_VERSION_MAX_SUPPORTED;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
case ssl_variant_datagram:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
vrange->min = SSL_LIBRARY_VERSION_TLS_1_1;
|
|
|
|
vrange->max = SSL_LIBRARY_VERSION_MAX_SUPPORTED;
|
|
|
|
break;
|
2018-05-04 16:08:28 +02:00
|
|
|
default:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_VersionRangeGetDefault(SSLProtocolVariant protocolVariant,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSLVersionRange *vrange)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
if ((protocolVariant != ssl_variant_stream &&
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
protocolVariant != ssl_variant_datagram) || !vrange) {
|
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
*vrange = *VERSIONS_DEFAULTS(protocolVariant);
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_VersionRangeSetDefault(SSLProtocolVariant protocolVariant,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
const SSLVersionRange *vrange)
|
2018-05-04 16:08:28 +02:00
|
|
|
{
|
|
|
|
if (!ssl3_VersionRangeIsValid(protocolVariant, vrange)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SSL_ERROR_INVALID_VERSION_RANGE);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
*VERSIONS_DEFAULTS(protocolVariant) = *vrange;
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_VersionRangeGet(PRFileDesc *fd, SSLVersionRange *vrange)
|
|
|
|
{
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL3_VersionRangeGet",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!vrange) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SEC_ERROR_INVALID_ARGS);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ssl_Get1stHandshakeLock(ss);
|
|
|
|
ssl_GetSSL3HandshakeLock(ss);
|
|
|
|
|
|
|
|
*vrange = ss->vrange;
|
|
|
|
|
|
|
|
ssl_ReleaseSSL3HandshakeLock(ss);
|
|
|
|
ssl_Release1stHandshakeLock(ss);
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_VersionRangeSet(PRFileDesc *fd, const SSLVersionRange *vrange)
|
|
|
|
{
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL3_VersionRangeSet",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!ssl3_VersionRangeIsValid(ss->protocolVariant, vrange)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(SSL_ERROR_INVALID_VERSION_RANGE);
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ssl_Get1stHandshakeLock(ss);
|
|
|
|
ssl_GetSSL3HandshakeLock(ss);
|
|
|
|
|
|
|
|
ss->vrange = *vrange;
|
|
|
|
|
|
|
|
ssl_ReleaseSSL3HandshakeLock(ss);
|
|
|
|
ssl_Release1stHandshakeLock(ss);
|
|
|
|
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
const SECItemArray *
|
|
|
|
SSL_PeerStapledOCSPResponses(PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
sslSocket *ss = ssl_FindSocket(fd);
|
|
|
|
|
|
|
|
if (!ss) {
|
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_PeerStapledOCSPResponses",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ss->sec.ci.sid) {
|
|
|
|
PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
|
|
|
|
return NULL;
|
|
|
|
}
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
return &ss->sec.ci.sid->peerCertStatus;
|
|
|
|
}
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
/************************************************************************/
|
|
|
|
/* The following functions are the TOP LEVEL SSL functions.
|
|
|
|
** They all get called through the NSPRIOMethods table below.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static PRFileDesc * PR_CALLBACK
|
|
|
|
ssl_Accept(PRFileDesc *fd, PRNetAddr *sockaddr, PRIntervalTime timeout)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
sslSocket *ns = NULL;
|
|
|
|
PRFileDesc *newfd = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
PRFileDesc *osfd;
|
|
|
|
PRStatus status;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in accept", SSL_GETPID(), fd));
|
|
|
|
return NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* IF this is a listen socket, there shouldn't be any I/O going on */
|
|
|
|
SSL_LOCK_READER(ss);
|
|
|
|
SSL_LOCK_WRITER(ss);
|
|
|
|
ssl_Get1stHandshakeLock(ss);
|
|
|
|
ssl_GetSSL3HandshakeLock(ss);
|
|
|
|
|
|
|
|
ss->cTimeout = timeout;
|
|
|
|
|
|
|
|
osfd = ss->fd->lower;
|
|
|
|
|
|
|
|
/* First accept connection */
|
|
|
|
newfd = osfd->methods->accept(osfd, sockaddr, timeout);
|
|
|
|
if (newfd == NULL) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: accept failed, errno=%d",
|
|
|
|
SSL_GETPID(), ss->fd, PORT_GetError()));
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* Create ssl module */
|
|
|
|
ns = ssl_DupSocket(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ssl_ReleaseSSL3HandshakeLock(ss);
|
|
|
|
ssl_Release1stHandshakeLock(ss);
|
|
|
|
SSL_UNLOCK_WRITER(ss);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_UNLOCK_READER(ss); /* ss isn't used below here. */
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
if (ns == NULL)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
/* push ssl module onto the new socket */
|
|
|
|
status = ssl_PushIOLayer(ns, newfd, PR_TOP_IO_LAYER);
|
|
|
|
if (status != PR_SUCCESS)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
/* Now start server connection handshake with client.
|
|
|
|
** Don't need locks here because nobody else has a reference to ns yet.
|
|
|
|
*/
|
|
|
|
if ( ns->opt.useSecurity ) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if ( ns->opt.handshakeAsClient ) {
|
|
|
|
ns->handshake = ssl2_BeginClientHandshake;
|
|
|
|
ss->handshaking = sslHandshakingAsClient;
|
|
|
|
} else {
|
|
|
|
ns->handshake = ssl2_BeginServerHandshake;
|
|
|
|
ss->handshaking = sslHandshakingAsServer;
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
ns->TCPconnected = 1;
|
|
|
|
return newfd;
|
|
|
|
|
|
|
|
loser:
|
|
|
|
if (ns != NULL)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_FreeSocket(ns);
|
2015-10-21 05:03:22 +02:00
|
|
|
if (newfd != NULL)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PR_Close(newfd);
|
2015-10-21 05:03:22 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_Connect(PRFileDesc *fd, const PRNetAddr *sockaddr, PRIntervalTime timeout)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
PRStatus rv;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in connect", SSL_GETPID(), fd));
|
|
|
|
return PR_FAILURE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* IF this is a listen socket, there shouldn't be any I/O going on */
|
|
|
|
SSL_LOCK_READER(ss);
|
|
|
|
SSL_LOCK_WRITER(ss);
|
|
|
|
|
|
|
|
ss->cTimeout = timeout;
|
|
|
|
rv = (PRStatus)(*ss->ops->connect)(ss, sockaddr);
|
|
|
|
|
|
|
|
SSL_UNLOCK_WRITER(ss);
|
|
|
|
SSL_UNLOCK_READER(ss);
|
|
|
|
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_Bind(PRFileDesc *fd, const PRNetAddr *addr)
|
|
|
|
{
|
|
|
|
sslSocket * ss = ssl_GetPrivate(fd);
|
|
|
|
PRStatus rv;
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in bind", SSL_GETPID(), fd));
|
|
|
|
return PR_FAILURE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
SSL_LOCK_READER(ss);
|
|
|
|
SSL_LOCK_WRITER(ss);
|
|
|
|
|
|
|
|
rv = (PRStatus)(*ss->ops->bind)(ss, addr);
|
|
|
|
|
|
|
|
SSL_UNLOCK_WRITER(ss);
|
|
|
|
SSL_UNLOCK_READER(ss);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_Listen(PRFileDesc *fd, PRIntn backlog)
|
|
|
|
{
|
|
|
|
sslSocket * ss = ssl_GetPrivate(fd);
|
|
|
|
PRStatus rv;
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in listen", SSL_GETPID(), fd));
|
|
|
|
return PR_FAILURE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
SSL_LOCK_READER(ss);
|
|
|
|
SSL_LOCK_WRITER(ss);
|
|
|
|
|
|
|
|
rv = (PRStatus)(*ss->ops->listen)(ss, backlog);
|
|
|
|
|
|
|
|
SSL_UNLOCK_WRITER(ss);
|
|
|
|
SSL_UNLOCK_READER(ss);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_Shutdown(PRFileDesc *fd, PRIntn how)
|
|
|
|
{
|
|
|
|
sslSocket * ss = ssl_GetPrivate(fd);
|
|
|
|
PRStatus rv;
|
|
|
|
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in shutdown", SSL_GETPID(), fd));
|
|
|
|
return PR_FAILURE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (how == PR_SHUTDOWN_RCV || how == PR_SHUTDOWN_BOTH) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_LOCK_READER(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (how == PR_SHUTDOWN_SEND || how == PR_SHUTDOWN_BOTH) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_LOCK_WRITER(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
rv = (PRStatus)(*ss->ops->shutdown)(ss, how);
|
|
|
|
|
|
|
|
if (how == PR_SHUTDOWN_SEND || how == PR_SHUTDOWN_BOTH) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_UNLOCK_WRITER(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (how == PR_SHUTDOWN_RCV || how == PR_SHUTDOWN_BOTH) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_UNLOCK_READER(ss);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_Close(PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
PRStatus rv;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in close", SSL_GETPID(), fd));
|
|
|
|
return PR_FAILURE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* There must not be any I/O going on */
|
|
|
|
SSL_LOCK_READER(ss);
|
|
|
|
SSL_LOCK_WRITER(ss);
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* By the time this function returns,
|
|
|
|
** ss is an invalid pointer, and the locks to which it points have
|
2015-10-21 05:03:22 +02:00
|
|
|
** been unlocked and freed. So, this is the ONE PLACE in all of SSL
|
|
|
|
** where the LOCK calls and the corresponding UNLOCK calls are not in
|
|
|
|
** the same function scope. The unlock calls are in ssl_FreeSocket().
|
|
|
|
*/
|
|
|
|
rv = (PRStatus)(*ss->ops->close)(ss);
|
|
|
|
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int PR_CALLBACK
|
|
|
|
ssl_Recv(PRFileDesc *fd, void *buf, PRInt32 len, PRIntn flags,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRIntervalTime timeout)
|
2015-10-21 05:03:22 +02:00
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
int rv;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in recv", SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
SSL_LOCK_READER(ss);
|
|
|
|
ss->rTimeout = timeout;
|
|
|
|
if (!ss->opt.fdx)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->wTimeout = timeout;
|
2015-10-21 05:03:22 +02:00
|
|
|
rv = (*ss->ops->recv)(ss, (unsigned char*)buf, len, flags);
|
|
|
|
SSL_UNLOCK_READER(ss);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int PR_CALLBACK
|
|
|
|
ssl_Send(PRFileDesc *fd, const void *buf, PRInt32 len, PRIntn flags,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRIntervalTime timeout)
|
2015-10-21 05:03:22 +02:00
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
int rv;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in send", SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
SSL_LOCK_WRITER(ss);
|
|
|
|
ss->wTimeout = timeout;
|
|
|
|
if (!ss->opt.fdx)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->rTimeout = timeout;
|
2015-10-21 05:03:22 +02:00
|
|
|
rv = (*ss->ops->send)(ss, (const unsigned char*)buf, len, flags);
|
|
|
|
SSL_UNLOCK_WRITER(ss);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int PR_CALLBACK
|
|
|
|
ssl_Read(PRFileDesc *fd, void *buf, PRInt32 len)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
int rv;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in read", SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
SSL_LOCK_READER(ss);
|
|
|
|
ss->rTimeout = PR_INTERVAL_NO_TIMEOUT;
|
|
|
|
if (!ss->opt.fdx)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->wTimeout = PR_INTERVAL_NO_TIMEOUT;
|
2015-10-21 05:03:22 +02:00
|
|
|
rv = (*ss->ops->read)(ss, (unsigned char*)buf, len);
|
|
|
|
SSL_UNLOCK_READER(ss);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int PR_CALLBACK
|
|
|
|
ssl_Write(PRFileDesc *fd, const void *buf, PRInt32 len)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
int rv;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in write", SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
SSL_LOCK_WRITER(ss);
|
|
|
|
ss->wTimeout = PR_INTERVAL_NO_TIMEOUT;
|
|
|
|
if (!ss->opt.fdx)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->rTimeout = PR_INTERVAL_NO_TIMEOUT;
|
2015-10-21 05:03:22 +02:00
|
|
|
rv = (*ss->ops->write)(ss, (const unsigned char*)buf, len);
|
|
|
|
SSL_UNLOCK_WRITER(ss);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_GetPeerName(PRFileDesc *fd, PRNetAddr *addr)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in getpeername", SSL_GETPID(), fd));
|
|
|
|
return PR_FAILURE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return (PRStatus)(*ss->ops->getpeername)(ss, addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
*/
|
|
|
|
SECStatus
|
|
|
|
ssl_GetPeerInfo(sslSocket *ss)
|
|
|
|
{
|
|
|
|
PRFileDesc * osfd;
|
|
|
|
int rv;
|
|
|
|
PRNetAddr sin;
|
|
|
|
|
|
|
|
osfd = ss->fd->lower;
|
|
|
|
|
|
|
|
PORT_Memset(&sin, 0, sizeof(sin));
|
|
|
|
rv = osfd->methods->getpeername(osfd, &sin);
|
|
|
|
if (rv < 0) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
ss->TCPconnected = 1;
|
|
|
|
if (sin.inet.family == PR_AF_INET) {
|
|
|
|
PR_ConvertIPv4AddrToIPv6(sin.inet.ip, &ss->sec.ci.peer);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->sec.ci.port = sin.inet.port;
|
2015-10-21 05:03:22 +02:00
|
|
|
} else if (sin.ipv6.family == PR_AF_INET6) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->sec.ci.peer = sin.ipv6.ip;
|
|
|
|
ss->sec.ci.port = sin.ipv6.port;
|
2015-10-21 05:03:22 +02:00
|
|
|
} else {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR);
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return SECSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_GetSockName(PRFileDesc *fd, PRNetAddr *name)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in getsockname", SSL_GETPID(), fd));
|
|
|
|
return PR_FAILURE;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return (PRStatus)(*ss->ops->getsockname)(ss, name);
|
|
|
|
}
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
SECStatus
|
|
|
|
SSL_SetStapledOCSPResponses(PRFileDesc *fd, const SECItemArray *responses,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSLKEAType kea)
|
2015-10-21 05:03:22 +02:00
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
|
|
|
|
ss = ssl_FindSocket(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetStapledOCSPResponses",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
if ( kea <= 0 || kea >= kt_kea_size) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: invalid key in SSL_SetStapledOCSPResponses",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ss->certStatusArray[kea]) {
|
|
|
|
SECITEM_FreeArray(ss->certStatusArray[kea], PR_TRUE);
|
|
|
|
ss->certStatusArray[kea] = NULL;
|
|
|
|
}
|
|
|
|
if (responses) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->certStatusArray[kea] = SECITEM_DupArray(NULL, responses);
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
return (ss->certStatusArray[kea] || !responses) ? SECSuccess : SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
SECStatus
|
|
|
|
SSL_SetSockPeerID(PRFileDesc *fd, const char *peerID)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
|
|
|
|
ss = ssl_FindSocket(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetSockPeerID",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return SECFailure;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ss->peerID) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_Free(ss->peerID);
|
|
|
|
ss->peerID = NULL;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
if (peerID)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->peerID = PORT_Strdup(peerID);
|
2018-05-04 16:08:28 +02:00
|
|
|
return (ss->peerID || !peerID) ? SECSuccess : SECFailure;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#define PR_POLL_RW (PR_POLL_WRITE | PR_POLL_READ)
|
|
|
|
|
|
|
|
static PRInt16 PR_CALLBACK
|
|
|
|
ssl_Poll(PRFileDesc *fd, PRInt16 how_flags, PRInt16 *p_out_flags)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRInt16 new_flags = how_flags; /* should select on these flags. */
|
2015-10-21 05:03:22 +02:00
|
|
|
PRNetAddr addr;
|
|
|
|
|
|
|
|
*p_out_flags = 0;
|
|
|
|
ss = ssl_GetPrivate(fd);
|
|
|
|
if (!ss) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
SSL_DBG(("%d: SSL[%d]: bad socket in SSL_Poll",
|
|
|
|
SSL_GETPID(), fd));
|
|
|
|
return 0; /* don't poll on this socket */
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (ss->opt.useSecurity &&
|
|
|
|
ss->handshaking != sslHandshakingUndetermined &&
|
2015-10-21 05:03:22 +02:00
|
|
|
!ss->firstHsDone &&
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
(how_flags & PR_POLL_RW)) {
|
|
|
|
if (!ss->TCPconnected) {
|
|
|
|
ss->TCPconnected = (PR_SUCCESS == ssl_DefGetpeername(ss, &addr));
|
|
|
|
}
|
|
|
|
/* If it's not connected, then presumably the application is polling
|
|
|
|
** on read or write appropriately, so don't change it.
|
|
|
|
*/
|
|
|
|
if (ss->TCPconnected) {
|
|
|
|
if (!ss->handshakeBegun) {
|
|
|
|
/* If the handshake has not begun, poll on read or write
|
|
|
|
** based on the local application's role in the handshake,
|
|
|
|
** not based on what the application requested.
|
|
|
|
*/
|
|
|
|
new_flags &= ~PR_POLL_RW;
|
|
|
|
if (ss->handshaking == sslHandshakingAsClient) {
|
|
|
|
new_flags |= PR_POLL_WRITE;
|
|
|
|
} else { /* handshaking as server */
|
|
|
|
new_flags |= PR_POLL_READ;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
/* First handshake is in progress */
|
|
|
|
if (ss->lastWriteBlocked) {
|
|
|
|
if (new_flags & PR_POLL_READ) {
|
|
|
|
/* The caller is waiting for data to be received,
|
|
|
|
** but the initial handshake is blocked on write, or the
|
|
|
|
** client's first handshake record has not been written.
|
|
|
|
** The code should select on write, not read.
|
|
|
|
*/
|
|
|
|
new_flags ^= PR_POLL_READ; /* don't select on read. */
|
|
|
|
new_flags |= PR_POLL_WRITE; /* do select on write. */
|
|
|
|
}
|
|
|
|
} else if (new_flags & PR_POLL_WRITE) {
|
|
|
|
/* The caller is trying to write, but the handshake is
|
|
|
|
** blocked waiting for data to read, and the first
|
|
|
|
** handshake has been sent. So do NOT to poll on write
|
|
|
|
** unless we did false start.
|
|
|
|
*/
|
|
|
|
if (!(ss->version >= SSL_LIBRARY_VERSION_3_0 &&
|
|
|
|
ss->ssl3.hs.canFalseStart)) {
|
|
|
|
new_flags ^= PR_POLL_WRITE; /* don't select on write. */
|
|
|
|
}
|
|
|
|
new_flags |= PR_POLL_READ; /* do select on read. */
|
|
|
|
}
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
} else if ((new_flags & PR_POLL_READ) && (SSL_DataPending(fd) > 0)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
*p_out_flags = PR_POLL_READ; /* it's ready already. */
|
|
|
|
return new_flags;
|
2015-10-21 05:03:22 +02:00
|
|
|
} else if ((ss->lastWriteBlocked) && (how_flags & PR_POLL_READ) &&
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
(ss->pendingBuf.len != 0)) { /* write data waiting to be sent */
|
|
|
|
new_flags |= PR_POLL_WRITE; /* also select on write. */
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ss->version >= SSL_LIBRARY_VERSION_3_0 &&
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->ssl3.hs.restartTarget != NULL) {
|
|
|
|
/* Read and write will block until the asynchronous callback completes
|
|
|
|
* (e.g. until SSL_AuthCertificateComplete is called), so don't tell
|
|
|
|
* the caller to poll the socket unless there is pending write data.
|
|
|
|
*/
|
|
|
|
if (ss->lastWriteBlocked && ss->pendingBuf.len != 0) {
|
|
|
|
/* Ignore any newly-received data on the socket, but do wait for
|
|
|
|
* the socket to become writable again. Here, it is OK for an error
|
|
|
|
* to be detected, because our logic for sending pending write data
|
|
|
|
* will allow us to report the error to the caller without the risk
|
|
|
|
* of the application spinning.
|
|
|
|
*/
|
|
|
|
new_flags &= (PR_POLL_WRITE | PR_POLL_EXCEPT);
|
|
|
|
} else {
|
|
|
|
/* Unfortunately, clearing new_flags will make it impossible for
|
|
|
|
* the application to detect errors that it would otherwise be
|
|
|
|
* able to detect with PR_POLL_EXCEPT, until the asynchronous
|
|
|
|
* callback completes. However, we must clear all the flags to
|
|
|
|
* prevent the application from spinning (alternating between
|
|
|
|
* calling PR_Poll that would return PR_POLL_EXCEPT, and send/recv
|
|
|
|
* which won't actually report the I/O error while we are waiting
|
|
|
|
* for the asynchronous callback to complete).
|
|
|
|
*/
|
|
|
|
new_flags = 0;
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
if (new_flags && (fd->lower->methods->poll != NULL)) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRInt16 lower_out_flags = 0;
|
|
|
|
PRInt16 lower_new_flags;
|
|
|
|
lower_new_flags = fd->lower->methods->poll(fd->lower, new_flags,
|
|
|
|
&lower_out_flags);
|
|
|
|
if ((lower_new_flags & lower_out_flags) && (how_flags != new_flags)) {
|
|
|
|
PRInt16 out_flags = lower_out_flags & ~PR_POLL_RW;
|
|
|
|
if (lower_out_flags & PR_POLL_READ)
|
|
|
|
out_flags |= PR_POLL_WRITE;
|
|
|
|
if (lower_out_flags & PR_POLL_WRITE)
|
|
|
|
out_flags |= PR_POLL_READ;
|
|
|
|
*p_out_flags = out_flags;
|
|
|
|
new_flags = how_flags;
|
|
|
|
} else {
|
|
|
|
*p_out_flags = lower_out_flags;
|
|
|
|
new_flags = lower_new_flags;
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return new_flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRInt32 PR_CALLBACK
|
|
|
|
ssl_TransmitFile(PRFileDesc *sd, PRFileDesc *fd,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
const void *headers, PRInt32 hlen,
|
|
|
|
PRTransmitFileFlags flags, PRIntervalTime timeout)
|
2015-10-21 05:03:22 +02:00
|
|
|
{
|
|
|
|
PRSendFileData sfd;
|
|
|
|
|
|
|
|
sfd.fd = fd;
|
|
|
|
sfd.file_offset = 0;
|
|
|
|
sfd.file_nbytes = 0;
|
|
|
|
sfd.header = headers;
|
|
|
|
sfd.hlen = hlen;
|
|
|
|
sfd.trailer = NULL;
|
|
|
|
sfd.tlen = 0;
|
|
|
|
|
|
|
|
return sd->methods->sendfile(sd, &sfd, flags, timeout);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PRBool
|
|
|
|
ssl_FdIsBlocking(PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
PRSocketOptionData opt;
|
|
|
|
PRStatus status;
|
|
|
|
|
|
|
|
opt.option = PR_SockOpt_Nonblocking;
|
|
|
|
opt.value.non_blocking = PR_FALSE;
|
|
|
|
status = PR_GetSocketOption(fd, &opt);
|
|
|
|
if (status != PR_SUCCESS)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return PR_FALSE;
|
2015-10-21 05:03:22 +02:00
|
|
|
return (PRBool)!opt.value.non_blocking;
|
|
|
|
}
|
|
|
|
|
|
|
|
PRBool
|
|
|
|
ssl_SocketIsBlocking(sslSocket *ss)
|
|
|
|
{
|
|
|
|
return ssl_FdIsBlocking(ss->fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
PRInt32 sslFirstBufSize = 8 * 1024;
|
|
|
|
PRInt32 sslCopyLimit = 1024;
|
|
|
|
|
|
|
|
static PRInt32 PR_CALLBACK
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_WriteV(PRFileDesc *fd, const PRIOVec *iov, PRInt32 vectors,
|
2015-10-21 05:03:22 +02:00
|
|
|
PRIntervalTime timeout)
|
|
|
|
{
|
2018-05-04 16:08:28 +02:00
|
|
|
PRInt32 i;
|
2015-10-21 05:03:22 +02:00
|
|
|
PRInt32 bufLen;
|
|
|
|
PRInt32 left;
|
|
|
|
PRInt32 rv;
|
|
|
|
PRInt32 sent = 0;
|
|
|
|
const PRInt32 first_len = sslFirstBufSize;
|
|
|
|
const PRInt32 limit = sslCopyLimit;
|
|
|
|
PRBool blocking;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRIOVec myIov = { 0, 0 };
|
2015-10-21 05:03:22 +02:00
|
|
|
char buf[MAX_FRAGMENT_LENGTH];
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
if (vectors < 0) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(PR_INVALID_ARGUMENT_ERROR);
|
|
|
|
return -1;
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
if (vectors > PR_MAX_IOVECTOR_SIZE) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_SetError(PR_BUFFER_OVERFLOW_ERROR);
|
|
|
|
return -1;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
for (i = 0; i < vectors; i++) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (iov[i].iov_len < 0) {
|
|
|
|
PORT_SetError(PR_INVALID_ARGUMENT_ERROR);
|
|
|
|
return -1;
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
blocking = ssl_FdIsBlocking(fd);
|
|
|
|
|
|
|
|
#define K16 sizeof(buf)
|
|
|
|
#define KILL_VECTORS while (vectors && !iov->iov_len) { ++iov; --vectors; }
|
|
|
|
#define GET_VECTOR do { myIov = *iov++; --vectors; KILL_VECTORS } while (0)
|
|
|
|
#define HANDLE_ERR(rv, len) \
|
|
|
|
if (rv != len) { \
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (rv < 0) { \
|
|
|
|
if (!blocking \
|
|
|
|
&& (PR_GetError() == PR_WOULD_BLOCK_ERROR) \
|
|
|
|
&& (sent > 0)) { \
|
|
|
|
return sent; \
|
|
|
|
} else { \
|
|
|
|
return -1; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
/* Only a nonblocking socket can have partial sends */ \
|
|
|
|
PR_ASSERT(!blocking); \
|
|
|
|
return sent + rv; \
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
#define SEND(bfr, len) \
|
|
|
|
do { \
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
rv = ssl_Send(fd, bfr, len, 0, timeout); \
|
|
|
|
HANDLE_ERR(rv, len) \
|
|
|
|
sent += len; \
|
2015-10-21 05:03:22 +02:00
|
|
|
} while (0)
|
|
|
|
|
|
|
|
/* Make sure the first write is at least 8 KB, if possible. */
|
|
|
|
KILL_VECTORS
|
|
|
|
if (!vectors)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return ssl_Send(fd, 0, 0, 0, timeout);
|
2015-10-21 05:03:22 +02:00
|
|
|
GET_VECTOR;
|
|
|
|
if (!vectors) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
return ssl_Send(fd, myIov.iov_base, myIov.iov_len, 0, timeout);
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
if (myIov.iov_len < first_len) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PORT_Memcpy(buf, myIov.iov_base, myIov.iov_len);
|
|
|
|
bufLen = myIov.iov_len;
|
|
|
|
left = first_len - bufLen;
|
|
|
|
while (vectors && left) {
|
|
|
|
int toCopy;
|
|
|
|
GET_VECTOR;
|
|
|
|
toCopy = PR_MIN(left, myIov.iov_len);
|
|
|
|
PORT_Memcpy(buf + bufLen, myIov.iov_base, toCopy);
|
|
|
|
bufLen += toCopy;
|
|
|
|
left -= toCopy;
|
|
|
|
myIov.iov_base += toCopy;
|
|
|
|
myIov.iov_len -= toCopy;
|
|
|
|
}
|
|
|
|
SEND( buf, bufLen );
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
while (vectors || myIov.iov_len) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRInt32 addLen;
|
|
|
|
if (!myIov.iov_len) {
|
|
|
|
GET_VECTOR;
|
|
|
|
}
|
|
|
|
while (myIov.iov_len >= K16) {
|
|
|
|
SEND(myIov.iov_base, K16);
|
|
|
|
myIov.iov_base += K16;
|
|
|
|
myIov.iov_len -= K16;
|
|
|
|
}
|
|
|
|
if (!myIov.iov_len)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!vectors || myIov.iov_len > limit) {
|
|
|
|
addLen = 0;
|
|
|
|
} else if ((addLen = iov->iov_len % K16) + myIov.iov_len <= limit) {
|
|
|
|
/* Addlen is already computed. */;
|
|
|
|
} else if (vectors > 1 &&
|
|
|
|
iov[1].iov_len % K16 + addLen + myIov.iov_len <= 2 * limit) {
|
|
|
|
addLen = limit - myIov.iov_len;
|
|
|
|
} else
|
|
|
|
addLen = 0;
|
|
|
|
|
|
|
|
if (!addLen) {
|
|
|
|
SEND( myIov.iov_base, myIov.iov_len );
|
|
|
|
myIov.iov_len = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
PORT_Memcpy(buf, myIov.iov_base, myIov.iov_len);
|
|
|
|
bufLen = myIov.iov_len;
|
|
|
|
do {
|
|
|
|
GET_VECTOR;
|
|
|
|
PORT_Memcpy(buf + bufLen, myIov.iov_base, addLen);
|
|
|
|
myIov.iov_base += addLen;
|
|
|
|
myIov.iov_len -= addLen;
|
|
|
|
bufLen += addLen;
|
|
|
|
|
|
|
|
left = PR_MIN( limit, K16 - bufLen);
|
|
|
|
if (!vectors /* no more left */
|
|
|
|
|| myIov.iov_len > 0 /* we didn't use that one all up */
|
|
|
|
|| bufLen >= K16 /* it's full. */
|
|
|
|
) {
|
|
|
|
addLen = 0;
|
|
|
|
} else if ((addLen = iov->iov_len % K16) <= left) {
|
|
|
|
/* Addlen is already computed. */;
|
|
|
|
} else if (vectors > 1 &&
|
|
|
|
iov[1].iov_len % K16 + addLen <= left + limit) {
|
|
|
|
addLen = left;
|
|
|
|
} else
|
|
|
|
addLen = 0;
|
|
|
|
|
|
|
|
} while (addLen);
|
|
|
|
SEND( buf, bufLen );
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
return sent;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These functions aren't implemented.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static PRInt32 PR_CALLBACK
|
|
|
|
ssl_Available(PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRInt64 PR_CALLBACK
|
|
|
|
ssl_Available64(PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
PRInt64 res;
|
|
|
|
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
LL_I2L(res, -1L);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_FSync(PRFileDesc *fd)
|
|
|
|
{
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
return PR_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRInt32 PR_CALLBACK
|
|
|
|
ssl_Seek(PRFileDesc *fd, PRInt32 offset, PRSeekWhence how) {
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRInt64 PR_CALLBACK
|
|
|
|
ssl_Seek64(PRFileDesc *fd, PRInt64 offset, PRSeekWhence how) {
|
|
|
|
PRInt64 res;
|
|
|
|
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
LL_I2L(res, -1L);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_FileInfo(PRFileDesc *fd, PRFileInfo *info)
|
|
|
|
{
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
return PR_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus PR_CALLBACK
|
|
|
|
ssl_FileInfo64(PRFileDesc *fd, PRFileInfo64 *info)
|
|
|
|
{
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
return PR_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRInt32 PR_CALLBACK
|
|
|
|
ssl_RecvFrom(PRFileDesc *fd, void *buf, PRInt32 amount, PRIntn flags,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRNetAddr *addr, PRIntervalTime timeout)
|
2015-10-21 05:03:22 +02:00
|
|
|
{
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRInt32 PR_CALLBACK
|
|
|
|
ssl_SendTo(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
const PRNetAddr *addr, PRIntervalTime timeout)
|
2015-10-21 05:03:22 +02:00
|
|
|
{
|
|
|
|
PORT_Assert(0);
|
|
|
|
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const PRIOMethods ssl_methods = {
|
|
|
|
PR_DESC_LAYERED,
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_Close, /* close */
|
|
|
|
ssl_Read, /* read */
|
|
|
|
ssl_Write, /* write */
|
|
|
|
ssl_Available, /* available */
|
|
|
|
ssl_Available64, /* available64 */
|
|
|
|
ssl_FSync, /* fsync */
|
|
|
|
ssl_Seek, /* seek */
|
|
|
|
ssl_Seek64, /* seek64 */
|
|
|
|
ssl_FileInfo, /* fileInfo */
|
|
|
|
ssl_FileInfo64, /* fileInfo64 */
|
|
|
|
ssl_WriteV, /* writev */
|
|
|
|
ssl_Connect, /* connect */
|
|
|
|
ssl_Accept, /* accept */
|
|
|
|
ssl_Bind, /* bind */
|
|
|
|
ssl_Listen, /* listen */
|
|
|
|
ssl_Shutdown, /* shutdown */
|
|
|
|
ssl_Recv, /* recv */
|
|
|
|
ssl_Send, /* send */
|
|
|
|
ssl_RecvFrom, /* recvfrom */
|
|
|
|
ssl_SendTo, /* sendto */
|
|
|
|
ssl_Poll, /* poll */
|
2015-10-21 05:03:22 +02:00
|
|
|
PR_EmulateAcceptRead, /* acceptread */
|
|
|
|
ssl_TransmitFile, /* transmitfile */
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_GetSockName, /* getsockname */
|
|
|
|
ssl_GetPeerName, /* getpeername */
|
|
|
|
NULL, /* getsockopt OBSOLETE */
|
|
|
|
NULL, /* setsockopt OBSOLETE */
|
|
|
|
NULL, /* getsocketoption */
|
|
|
|
NULL, /* setsocketoption */
|
|
|
|
PR_EmulateSendFile, /* Send a (partial) file with header/trailer*/
|
|
|
|
NULL, /* reserved for future use */
|
|
|
|
NULL, /* reserved for future use */
|
|
|
|
NULL, /* reserved for future use */
|
|
|
|
NULL, /* reserved for future use */
|
|
|
|
NULL /* reserved for future use */
|
2015-10-21 05:03:22 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static PRIOMethods combined_methods;
|
|
|
|
|
|
|
|
static void
|
|
|
|
ssl_SetupIOMethods(void)
|
|
|
|
{
|
|
|
|
PRIOMethods *new_methods = &combined_methods;
|
|
|
|
const PRIOMethods *nspr_methods = PR_GetDefaultIOMethods();
|
|
|
|
const PRIOMethods *my_methods = &ssl_methods;
|
|
|
|
|
|
|
|
*new_methods = *nspr_methods;
|
|
|
|
|
|
|
|
new_methods->file_type = my_methods->file_type;
|
|
|
|
new_methods->close = my_methods->close;
|
|
|
|
new_methods->read = my_methods->read;
|
|
|
|
new_methods->write = my_methods->write;
|
|
|
|
new_methods->available = my_methods->available;
|
|
|
|
new_methods->available64 = my_methods->available64;
|
|
|
|
new_methods->fsync = my_methods->fsync;
|
|
|
|
new_methods->seek = my_methods->seek;
|
|
|
|
new_methods->seek64 = my_methods->seek64;
|
|
|
|
new_methods->fileInfo = my_methods->fileInfo;
|
|
|
|
new_methods->fileInfo64 = my_methods->fileInfo64;
|
|
|
|
new_methods->writev = my_methods->writev;
|
|
|
|
new_methods->connect = my_methods->connect;
|
|
|
|
new_methods->accept = my_methods->accept;
|
|
|
|
new_methods->bind = my_methods->bind;
|
|
|
|
new_methods->listen = my_methods->listen;
|
|
|
|
new_methods->shutdown = my_methods->shutdown;
|
|
|
|
new_methods->recv = my_methods->recv;
|
|
|
|
new_methods->send = my_methods->send;
|
|
|
|
new_methods->recvfrom = my_methods->recvfrom;
|
|
|
|
new_methods->sendto = my_methods->sendto;
|
|
|
|
new_methods->poll = my_methods->poll;
|
|
|
|
new_methods->acceptread = my_methods->acceptread;
|
|
|
|
new_methods->transmitfile = my_methods->transmitfile;
|
|
|
|
new_methods->getsockname = my_methods->getsockname;
|
|
|
|
new_methods->getpeername = my_methods->getpeername;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
/* new_methods->getsocketoption = my_methods->getsocketoption; */
|
|
|
|
/* new_methods->setsocketoption = my_methods->setsocketoption; */
|
2015-10-21 05:03:22 +02:00
|
|
|
new_methods->sendfile = my_methods->sendfile;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRCallOnceType initIoLayerOnce;
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
static PRStatus
|
2015-10-21 05:03:22 +02:00
|
|
|
ssl_InitIOLayer(void)
|
|
|
|
{
|
|
|
|
ssl_layer_id = PR_GetUniqueIdentity("SSL");
|
|
|
|
ssl_SetupIOMethods();
|
|
|
|
ssl_inited = PR_TRUE;
|
|
|
|
return PR_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRStatus
|
|
|
|
ssl_PushIOLayer(sslSocket *ns, PRFileDesc *stack, PRDescIdentity id)
|
|
|
|
{
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
PRFileDesc *layer = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
PRStatus status;
|
|
|
|
|
|
|
|
if (!ssl_inited) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
status = PR_CallOnce(&initIoLayerOnce, &ssl_InitIOLayer);
|
|
|
|
if (status != PR_SUCCESS)
|
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ns == NULL)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
layer = PR_CreateIOLayerStub(ssl_layer_id, &combined_methods);
|
|
|
|
if (layer == NULL)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
layer->secret = (PRFilePrivate *)ns;
|
|
|
|
|
|
|
|
/* Here, "stack" points to the PRFileDesc on the top of the stack.
|
|
|
|
** "layer" points to a new FD that is to be inserted into the stack.
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
** If layer is being pushed onto the top of the stack, then
|
2015-10-21 05:03:22 +02:00
|
|
|
** PR_PushIOLayer switches the contents of stack and layer, and then
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
** puts stack on top of layer, so that after it is done, the top of
|
|
|
|
** stack is the same "stack" as it was before, and layer is now the
|
2015-10-21 05:03:22 +02:00
|
|
|
** FD for the former top of stack.
|
|
|
|
** After this call, stack always points to the top PRFD on the stack.
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
** If this function fails, the contents of stack and layer are as
|
2015-10-21 05:03:22 +02:00
|
|
|
** they were before the call.
|
|
|
|
*/
|
|
|
|
status = PR_PushIOLayer(stack, id, layer);
|
|
|
|
if (status != PR_SUCCESS)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
ns->fd = (id == PR_TOP_IO_LAYER) ? stack : layer;
|
|
|
|
return PR_SUCCESS;
|
|
|
|
|
|
|
|
loser:
|
|
|
|
if (layer) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
layer->dtor(layer); /* free layer */
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return PR_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if this fails, caller must destroy socket. */
|
|
|
|
static SECStatus
|
|
|
|
ssl_MakeLocks(sslSocket *ss)
|
|
|
|
{
|
|
|
|
ss->firstHandshakeLock = PZ_NewMonitor(nssILockSSL);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (!ss->firstHandshakeLock)
|
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
ss->ssl3HandshakeLock = PZ_NewMonitor(nssILockSSL);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (!ss->ssl3HandshakeLock)
|
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
ss->specLock = NSSRWLock_New(SSL_LOCK_RANK_SPEC, NULL);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (!ss->specLock)
|
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
ss->recvBufLock = PZ_NewMonitor(nssILockSSL);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (!ss->recvBufLock)
|
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
ss->xmitBufLock = PZ_NewMonitor(nssILockSSL);
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
if (!ss->xmitBufLock)
|
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
ss->writerThread = NULL;
|
|
|
|
if (ssl_lock_readers) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->recvLock = PZ_NewLock(nssILockSSL);
|
|
|
|
if (!ss->recvLock)
|
|
|
|
goto loser;
|
|
|
|
ss->sendLock = PZ_NewLock(nssILockSSL);
|
|
|
|
if (!ss->sendLock)
|
|
|
|
goto loser;
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return SECSuccess;
|
|
|
|
loser:
|
|
|
|
ssl_DestroyLocks(ss);
|
|
|
|
return SECFailure;
|
|
|
|
}
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
#if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_BEOS)
|
2015-10-21 05:03:22 +02:00
|
|
|
#define NSS_HAVE_GETENV 1
|
|
|
|
#endif
|
|
|
|
|
2018-05-04 16:08:28 +02:00
|
|
|
#define LOWER(x) (x | 0x20) /* cheap ToLower function ignores LOCALE */
|
|
|
|
|
|
|
|
static void
|
|
|
|
ssl_SetDefaultsFromEnvironment(void)
|
2015-10-21 05:03:22 +02:00
|
|
|
{
|
|
|
|
#if defined( NSS_HAVE_GETENV )
|
|
|
|
static int firsttime = 1;
|
|
|
|
|
|
|
|
if (firsttime) {
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
char * ev;
|
|
|
|
firsttime = 0;
|
2015-10-21 05:03:22 +02:00
|
|
|
#ifdef DEBUG
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ev = getenv("SSLDEBUGFILE");
|
|
|
|
if (ev && ev[0]) {
|
|
|
|
ssl_trace_iob = fopen(ev, "w");
|
|
|
|
}
|
|
|
|
if (!ssl_trace_iob) {
|
|
|
|
ssl_trace_iob = stderr;
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
#ifdef TRACE
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ev = getenv("SSLTRACE");
|
|
|
|
if (ev && ev[0]) {
|
|
|
|
ssl_trace = atoi(ev);
|
|
|
|
SSL_TRACE(("SSL: tracing set to %d", ssl_trace));
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
#endif /* TRACE */
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ev = getenv("SSLDEBUG");
|
|
|
|
if (ev && ev[0]) {
|
|
|
|
ssl_debug = atoi(ev);
|
|
|
|
SSL_TRACE(("SSL: debugging set to %d", ssl_debug));
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
#endif /* DEBUG */
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ev = getenv("SSLKEYLOGFILE");
|
|
|
|
if (ev && ev[0]) {
|
|
|
|
ssl_keylog_iob = fopen(ev, "a");
|
|
|
|
if (!ssl_keylog_iob) {
|
|
|
|
SSL_TRACE(("SSL: failed to open key log file"));
|
|
|
|
} else {
|
|
|
|
if (ftell(ssl_keylog_iob) == 0) {
|
|
|
|
fputs("# SSL/TLS secrets log file, generated by NSS\n",
|
|
|
|
ssl_keylog_iob);
|
|
|
|
}
|
|
|
|
SSL_TRACE(("SSL: logging SSL/TLS secrets to %s", ev));
|
|
|
|
}
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
#ifndef NO_PKCS11_BYPASS
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ev = getenv("SSLBYPASS");
|
|
|
|
if (ev && ev[0]) {
|
|
|
|
ssl_defaults.bypassPKCS11 = (ev[0] == '1');
|
|
|
|
SSL_TRACE(("SSL: bypass default set to %d", \
|
|
|
|
ssl_defaults.bypassPKCS11));
|
|
|
|
}
|
2018-05-04 16:08:28 +02:00
|
|
|
#endif /* NO_PKCS11_BYPASS */
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ev = getenv("SSLFORCELOCKS");
|
|
|
|
if (ev && ev[0] == '1') {
|
|
|
|
ssl_force_locks = PR_TRUE;
|
|
|
|
ssl_defaults.noLocks = 0;
|
|
|
|
strcpy(lockStatus + LOCKSTATUS_OFFSET, "FORCED. ");
|
|
|
|
SSL_TRACE(("SSL: force_locks set to %d", ssl_force_locks));
|
|
|
|
}
|
|
|
|
ev = getenv("NSS_SSL_ENABLE_RENEGOTIATION");
|
|
|
|
if (ev) {
|
|
|
|
if (ev[0] == '1' || LOWER(ev[0]) == 'u')
|
|
|
|
ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_UNRESTRICTED;
|
|
|
|
else if (ev[0] == '0' || LOWER(ev[0]) == 'n')
|
|
|
|
ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_NEVER;
|
|
|
|
else if (ev[0] == '2' || LOWER(ev[0]) == 'r')
|
|
|
|
ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_REQUIRES_XTN;
|
|
|
|
else if (ev[0] == '3' || LOWER(ev[0]) == 't')
|
|
|
|
ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_TRANSITIONAL;
|
|
|
|
SSL_TRACE(("SSL: enableRenegotiation set to %d",
|
|
|
|
ssl_defaults.enableRenegotiation));
|
|
|
|
}
|
|
|
|
ev = getenv("NSS_SSL_REQUIRE_SAFE_NEGOTIATION");
|
|
|
|
if (ev && ev[0] == '1') {
|
|
|
|
ssl_defaults.requireSafeNegotiation = PR_TRUE;
|
|
|
|
SSL_TRACE(("SSL: requireSafeNegotiation set to %d",
|
|
|
|
PR_TRUE));
|
|
|
|
}
|
|
|
|
ev = getenv("NSS_SSL_CBC_RANDOM_IV");
|
|
|
|
if (ev && ev[0] == '0') {
|
|
|
|
ssl_defaults.cbcRandomIV = PR_FALSE;
|
|
|
|
SSL_TRACE(("SSL: cbcRandomIV set to 0"));
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
#endif /* NSS_HAVE_GETENV */
|
2018-05-04 16:08:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Create a newsocket structure for a file descriptor.
|
|
|
|
*/
|
|
|
|
static sslSocket *
|
|
|
|
ssl_NewSocket(PRBool makeLocks, SSLProtocolVariant protocolVariant)
|
|
|
|
{
|
|
|
|
sslSocket *ss;
|
|
|
|
|
|
|
|
ssl_SetDefaultsFromEnvironment();
|
|
|
|
|
2015-10-21 05:03:22 +02:00
|
|
|
if (ssl_force_locks)
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
makeLocks = PR_TRUE;
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
/* Make a new socket and get it ready */
|
|
|
|
ss = (sslSocket*) PORT_ZAlloc(sizeof(sslSocket));
|
|
|
|
if (ss) {
|
|
|
|
/* This should be of type SSLKEAType, but CC on IRIX
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
* complains during the for loop.
|
|
|
|
*/
|
|
|
|
int i;
|
|
|
|
SECStatus status;
|
|
|
|
|
|
|
|
ss->opt = ssl_defaults;
|
|
|
|
ss->opt.useSocks = PR_FALSE;
|
|
|
|
ss->opt.noLocks = !makeLocks;
|
|
|
|
ss->vrange = *VERSIONS_DEFAULTS(protocolVariant);
|
|
|
|
ss->protocolVariant = protocolVariant;
|
|
|
|
|
|
|
|
ss->peerID = NULL;
|
|
|
|
ss->rTimeout = PR_INTERVAL_NO_TIMEOUT;
|
|
|
|
ss->wTimeout = PR_INTERVAL_NO_TIMEOUT;
|
|
|
|
ss->cTimeout = PR_INTERVAL_NO_TIMEOUT;
|
|
|
|
ss->cipherSpecs = NULL;
|
2015-10-21 05:03:22 +02:00
|
|
|
ss->sizeCipherSpecs = 0; /* produced lazily */
|
|
|
|
ss->preferredCipher = NULL;
|
|
|
|
ss->url = NULL;
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
for (i=kt_null; i < kt_kea_size; i++) {
|
|
|
|
sslServerCerts * sc = ss->serverCerts + i;
|
|
|
|
sc->serverCert = NULL;
|
|
|
|
sc->serverCertChain = NULL;
|
|
|
|
sc->serverKeyPair = NULL;
|
|
|
|
sc->serverKeyBits = 0;
|
|
|
|
ss->certStatusArray[i] = NULL;
|
|
|
|
}
|
|
|
|
ss->stepDownKeyPair = NULL;
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
|
|
|
|
ss->dheParams = NULL;
|
|
|
|
ss->dheKeyPair = NULL;
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->dbHandle = CERT_GetDefaultCertDB();
|
|
|
|
|
|
|
|
/* Provide default implementation of hooks */
|
|
|
|
ss->authCertificate = SSL_AuthCertificate;
|
|
|
|
ss->authCertificateArg = (void *)ss->dbHandle;
|
2018-05-04 16:08:28 +02:00
|
|
|
ss->sniSocketConfig = NULL;
|
|
|
|
ss->sniSocketConfigArg = NULL;
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ss->getClientAuthData = NULL;
|
|
|
|
ss->handleBadCert = NULL;
|
|
|
|
ss->badCertArg = NULL;
|
|
|
|
ss->pkcs11PinArg = NULL;
|
|
|
|
ss->ephemeralECDHKeyPair = NULL;
|
|
|
|
|
|
|
|
ssl_ChooseOps(ss);
|
|
|
|
ssl2_InitSocketPolicy(ss);
|
|
|
|
ssl3_InitSocketPolicy(ss);
|
|
|
|
PR_INIT_CLIST(&ss->ssl3.hs.lastMessageFlight);
|
|
|
|
|
|
|
|
if (makeLocks) {
|
|
|
|
status = ssl_MakeLocks(ss);
|
|
|
|
if (status != SECSuccess)
|
|
|
|
goto loser;
|
|
|
|
}
|
|
|
|
status = ssl_CreateSecurityInfo(ss);
|
|
|
|
if (status != SECSuccess)
|
|
|
|
goto loser;
|
|
|
|
status = ssl_InitGather(&ss->gs);
|
|
|
|
if (status != SECSuccess) {
|
2015-10-21 05:03:22 +02:00
|
|
|
loser:
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
ssl_DestroySocketContents(ss);
|
|
|
|
ssl_DestroyLocks(ss);
|
|
|
|
PORT_Free(ss);
|
|
|
|
ss = NULL;
|
|
|
|
}
|
2015-10-21 05:03:22 +02:00
|
|
|
}
|
|
|
|
return ss;
|
|
|
|
}
|