← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/cmd/strsclnt/strsclnt.c

Tags: 3.12.8-0ubuntu0.10.10.1
* New upstream release v3.12.8 (NSS_3_12_8_RTM)
  - Fix browser wildcard certificate validation issue
  - Update root certs
  - Fix SSL deadlocks
* Refresh patches:
  - update debian/patches/38_kbsd.patch
  - update debian/patches/97_SSL_RENEGOTIATE_TRANSITIONAL.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/cmd/strsclnt/strsclnt.c
162
162
static PRBool ignoreErrors    = PR_FALSE;
163
163
static PRBool enableSessionTickets = PR_FALSE;
164
164
static PRBool enableCompression    = PR_FALSE;
 
165
static PRBool enableFalseStart     = PR_FALSE;
165
166
 
166
167
PRIntervalTime maxInterval    = PR_INTERVAL_NO_TIMEOUT;
167
168
 
197
198
        "       -U means enable throttling up threads\n"
198
199
        "       -B bypasses the PKCS11 layer for SSL encryption and MACing\n"
199
200
        "       -u enable TLS Session Ticket extension\n"
200
 
        "       -z enable compression\n",
 
201
        "       -z enable compression\n"
 
202
        "       -g enable false start\n",
201
203
        progName);
202
204
    exit(1);
203
205
}
1244
1246
            errExit("SSL_OptionSet SSL_ENABLE_DEFLATE");
1245
1247
    }
1246
1248
 
 
1249
    if (enableFalseStart) {
 
1250
        rv = SSL_OptionSet(model_sock, SSL_ENABLE_FALSE_START, PR_TRUE);
 
1251
        if (rv != SECSuccess)
 
1252
            errExit("SSL_OptionSet SSL_ENABLE_FALSE_START");
 
1253
    }
 
1254
 
1247
1255
    SSL_SetURL(model_sock, hostName);
1248
1256
 
1249
1257
    SSL_AuthCertificateHook(model_sock, mySSLAuthCertificate, 
1354
1362
 
1355
1363
 
1356
1364
    optstate = PL_CreateOptState(argc, argv,
1357
 
                                 "23BC:DNP:TUW:a:c:d:f:in:op:qst:uvw:z");
 
1365
                                 "23BC:DNP:TUW:a:c:d:f:gin:op:qst:uvw:z");
1358
1366
    while ((status = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
1359
1367
        switch(optstate->option) {
1360
1368
 
1384
1392
 
1385
1393
        case 'f': fileName = optstate->value; break;
1386
1394
 
 
1395
        case 'g': enableFalseStart = PR_TRUE; break;
 
1396
 
1387
1397
        case 'i': ignoreErrors = PR_TRUE; break;
1388
1398
 
1389
1399
        case 'n': nickName = PL_strdup(optstate->value); break;