Bug 1320695 - Allow use of session tickets when there is no ticket wr…

…apping key, r=ttaubert

Differential Revision: https://nss-review.dev.mozaws.net/D176

--HG--
extra : rebase_source : 94d1406e4bbac015ddc656e29e2c9cfafdd8d980

lib/ssl/sslsnce.c

@@ -2041,15 +2041,11 @@ ssl_GenerateSessionTicketKeys(void *pwArg, unsigned char *keyName,
     SECStatus rv;
     cacheDesc *cache = &globalCache;
 
-    if (!cache->cacheMem) {
-        /* cache is uninitialized. Generate keys and return them
-         * without caching. */
-        return GenerateTicketKeys(pwArg, keyName, encKey, macKey);
-    }
-
     rv = ssl_GetSessionTicketKeyPair(&svrPubKey, &svrPrivKey);
-    if (rv != SECSuccess) {
-        return SECFailure;
+    if (rv != SECSuccess || !cache->cacheMem) {
+        /* No key pair for wrapping, or the cache is uninitialized. Generate
+         * keys and return them without caching. */
+        return GenerateTicketKeys(pwArg, keyName, encKey, macKey);
     }
 
     now = LockSidCacheLock(cache->keyCacheLock, 0);