mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-24 09:27:31 +09:00
Update NSS to 3.48 while keeping vc2013 hackfix and no-sslkeylogfile intact.
This commit is contained in:
Roy Tam
parent
0b9855b841
commit
171849c8e5
351 changed files with 115185 additions and 57946 deletions
|
|
@ -159,11 +159,16 @@ typedef SECStatus(PR_CALLBACK *SSLExtensionHandler)(
|
|||
handler, handlerArg))
|
||||
|
||||
/*
|
||||
* Setup the anti-replay buffer for supporting 0-RTT in TLS 1.3 on servers.
|
||||
* Create an anti-replay context for supporting 0-RTT in TLS 1.3 on servers.
|
||||
*
|
||||
* To use 0-RTT on a server, you must call this function. Failing to call this
|
||||
* function will result in all 0-RTT being rejected. Connections will complete,
|
||||
* but early data will be rejected.
|
||||
* To use 0-RTT on a server, you must create an anti-replay context using
|
||||
* SSL_CreateAntiReplayContext and set that on the socket with
|
||||
* SSL_SetAntiReplayContext. Failing to set a context on the server will result
|
||||
* in all 0-RTT being rejected. Connections will complete, but early data will
|
||||
* be rejected.
|
||||
*
|
||||
* Anti-replay contexts are reference counted and are released with
|
||||
* SSL_ReleaseAntiReplayContext.
|
||||
*
|
||||
* NSS uses a Bloom filter to track the ClientHello messages that it receives
|
||||
* (specifically, it uses the PSK binder). This function initializes a pair of
|
||||
|
|
@ -181,11 +186,11 @@ typedef SECStatus(PR_CALLBACK *SSLExtensionHandler)(
|
|||
* The first tuning parameter to consider is |window|, which determines the
|
||||
* window over which ClientHello messages will be tracked. This also causes
|
||||
* early data to be rejected if a ClientHello contains a ticket age parameter
|
||||
* that is outside of this window (see Section 4.2.10.4 of
|
||||
* draft-ietf-tls-tls13-20 for details). Set |window| to account for any
|
||||
* potential sources of clock error. |window| is the entire width of the
|
||||
* window, which is symmetrical. Therefore to allow 5 seconds of clock error in
|
||||
* both directions, set the value to 10 seconds (i.e., 10 * PR_USEC_PER_SEC).
|
||||
* that is outside of this window (see Section 8.3 of RFC 8446 for details).
|
||||
* Set |window| to account for any potential sources of clock error. |window|
|
||||
* is the entire width of the window, which is symmetrical. Therefore to allow
|
||||
* 5 seconds of clock error in both directions, set the value to 10 seconds
|
||||
* (i.e., 10 * PR_USEC_PER_SEC).
|
||||
*
|
||||
* After calling this function, early data will be rejected until |window|
|
||||
* elapses. This prevents replay across crashes and restarts. Only call this
|
||||
|
|
@ -219,10 +224,23 @@ typedef SECStatus(PR_CALLBACK *SSLExtensionHandler)(
|
|||
* Early data can be replayed at least once with every server instance that will
|
||||
* accept tickets that are encrypted with the same key.
|
||||
*/
|
||||
#define SSL_SetupAntiReplay(window, k, bits) \
|
||||
SSL_EXPERIMENTAL_API("SSL_SetupAntiReplay", \
|
||||
(PRTime _window, unsigned int _k, unsigned int _bits), \
|
||||
(window, k, bits))
|
||||
typedef struct SSLAntiReplayContextStr SSLAntiReplayContext;
|
||||
#define SSL_CreateAntiReplayContext(now, window, k, bits, ctx) \
|
||||
SSL_EXPERIMENTAL_API("SSL_CreateAntiReplayContext", \
|
||||
(PRTime _now, PRTime _window, \
|
||||
unsigned int _k, unsigned int _bits, \
|
||||
SSLAntiReplayContext **_ctx), \
|
||||
(now, window, k, bits, ctx))
|
||||
|
||||
#define SSL_SetAntiReplayContext(fd, ctx) \
|
||||
SSL_EXPERIMENTAL_API("SSL_SetAntiReplayContext", \
|
||||
(PRFileDesc * _fd, SSLAntiReplayContext * _ctx), \
|
||||
(fd, ctx))
|
||||
|
||||
#define SSL_ReleaseAntiReplayContext(ctx) \
|
||||
SSL_EXPERIMENTAL_API("SSL_ReleaseAntiReplayContext", \
|
||||
(SSLAntiReplayContext * _ctx), \
|
||||
(ctx))
|
||||
|
||||
/*
|
||||
* This function allows a server application to generate a session ticket that
|
||||
|
|
@ -307,6 +325,10 @@ typedef SECStatus(PR_CALLBACK *SSLExtensionHandler)(
|
|||
* reject a second ClientHello (i.e., when firstHello is PR_FALSE); NSS will
|
||||
* abort the handshake if this value is returned from a second call.
|
||||
*
|
||||
* - Returning ssl_hello_retry_reject_0rtt causes NSS to proceed normally, but
|
||||
* to reject 0-RTT. Use this if there is something in the token that
|
||||
* indicates that 0-RTT might be unsafe.
|
||||
*
|
||||
* An application that chooses to perform a stateless retry can discard the
|
||||
* server socket. All necessary state to continue the TLS handshake will be
|
||||
* included in the cookie extension. This makes it possible to use a new socket
|
||||
|
|
@ -326,7 +348,8 @@ typedef SECStatus(PR_CALLBACK *SSLExtensionHandler)(
|
|||
typedef enum {
|
||||
ssl_hello_retry_fail,
|
||||
ssl_hello_retry_accept,
|
||||
ssl_hello_retry_request
|
||||
ssl_hello_retry_request,
|
||||
ssl_hello_retry_reject_0rtt
|
||||
} SSLHelloRetryRequestAction;
|
||||
|
||||
typedef SSLHelloRetryRequestAction(PR_CALLBACK *SSLHelloRetryRequestCallback)(
|
||||
|
|
@ -513,7 +536,7 @@ typedef SECStatus(PR_CALLBACK *SSLResumptionTokenCallback)(
|
|||
* group -- the named group this key corresponds to
|
||||
* pubKey -- the public key for the key pair
|
||||
* pad -- the length to pad to
|
||||
* notBefore/notAfter -- validity range
|
||||
* notBefore/notAfter -- validity range in seconds since epoch
|
||||
* out/outlen/maxlen -- where to output the data
|
||||
*/
|
||||
#define SSL_EncodeESNIKeys(cipherSuites, cipherSuiteCount, \
|
||||
|
|
@ -723,8 +746,90 @@ typedef struct SSLAeadContextStr SSLAeadContext;
|
|||
hsHash, hsHashLen, label, labelLen, \
|
||||
mech, keySize, keyp))
|
||||
|
||||
/* SSL_SetTimeFunc overrides the default time function (PR_Now()) and provides
|
||||
* an alternative source of time for the socket. This is used in testing, and in
|
||||
* applications that need better control over how the clock is accessed. Set the
|
||||
* function to NULL to use PR_Now().*/
|
||||
typedef PRTime(PR_CALLBACK *SSLTimeFunc)(void *arg);
|
||||
|
||||
#define SSL_SetTimeFunc(fd, f, arg) \
|
||||
SSL_EXPERIMENTAL_API("SSL_SetTimeFunc", \
|
||||
(PRFileDesc * _fd, SSLTimeFunc _f, void *_arg), \
|
||||
(fd, f, arg))
|
||||
|
||||
/* Create a delegated credential (DC) for the draft-ietf-tls-subcerts extension
|
||||
* using the given certificate |cert| and its signing key |certPriv| and write
|
||||
* the serialized DC to |out|. The
|
||||
* parameters are:
|
||||
* - the DC public key |dcPub|;
|
||||
* - the DC signature scheme |dcCertVerifyAlg|, used to verify the handshake.
|
||||
* - the DC time-to-live |dcValidFor|, the number of seconds from now for which
|
||||
* the DC should be valid; and
|
||||
* - the current time |now|.
|
||||
*
|
||||
* The signing algorithm used to verify the DC signature is deduced from
|
||||
* |cert|.
|
||||
*
|
||||
* It's the caller's responsibility to ensure the input parameters are all
|
||||
* valid. This procedure is meant primarily for testing; for this purpose it is
|
||||
* useful to do no validation.
|
||||
*/
|
||||
#define SSL_DelegateCredential(cert, certPriv, dcPub, dcCertVerifyAlg, \
|
||||
dcValidFor, now, out) \
|
||||
SSL_EXPERIMENTAL_API("SSL_DelegateCredential", \
|
||||
(const CERTCertificate *_cert, \
|
||||
const SECKEYPrivateKey *_certPriv, \
|
||||
const SECKEYPublicKey *_dcPub, \
|
||||
SSLSignatureScheme _dcCertVerifyAlg, \
|
||||
PRUint32 _dcValidFor, \
|
||||
PRTime _now, \
|
||||
SECItem *_out), \
|
||||
(cert, certPriv, dcPub, dcCertVerifyAlg, dcValidFor, \
|
||||
now, out))
|
||||
|
||||
/* New functions created to permit get/set the CipherSuites Order for the
|
||||
* handshake (Client Hello).
|
||||
*
|
||||
* The *Get function puts the current set of active (enabled and policy set as
|
||||
* PR_TRUE) cipher suites in the cipherOrder outparam. Cipher suites that
|
||||
* aren't active aren't included. The paramenters are:
|
||||
* - PRFileDesc *fd = FileDescriptor to get information.
|
||||
* - PRUint16 *cipherOrder = The memory allocated for cipherOrder needs to be
|
||||
* SSL_GetNumImplementedCiphers() * sizeof(PRUint16) or more.
|
||||
* - PRUint16 numCiphers = The number of active ciphersuites listed in
|
||||
* *cipherOrder is written here.
|
||||
*
|
||||
* The *Set function permits reorder the CipherSuites list for the Handshake
|
||||
* (Client Hello). The default ordering defined in ssl3con.c is enough in
|
||||
* almost all cases. But, if the client needs some hardening or performance
|
||||
* adjusts related to CipherSuites, this can be done with this function.
|
||||
* The caller has to be aware about the risk of call this function while a
|
||||
* handshake are being processed in this fd/socket. For example, if you disable
|
||||
* a cipher after the handshake and this cipher was choosen for that
|
||||
* connection, something bad will happen.
|
||||
* The parameters are:
|
||||
* - PRFileDesc *fd = FileDescriptor to change.
|
||||
* - const PRUint16 *cipherOrder = Must receive all ciphers to be ordered, in
|
||||
* the desired order. They will be set in the begin of the list. Only
|
||||
* suites listed by SSL_ImplementedCiphers() can be included.
|
||||
* - PRUint16 numCiphers = Must receive the number of items in *cipherOrder.
|
||||
* */
|
||||
#define SSL_CipherSuiteOrderGet(fd, cipherOrder, numCiphers) \
|
||||
SSL_EXPERIMENTAL_API("SSL_CipherSuiteOrderGet", \
|
||||
(PRFileDesc * _fd, PRUint16 * _cipherOrder, \
|
||||
unsigned int *_numCiphers), \
|
||||
(fd, cipherOrder, numCiphers))
|
||||
|
||||
#define SSL_CipherSuiteOrderSet(fd, cipherOrder, numCiphers) \
|
||||
SSL_EXPERIMENTAL_API("SSL_CipherSuiteOrderSet", \
|
||||
(PRFileDesc * _fd, const PRUint16 *_cipherOrder, \
|
||||
PRUint16 _numCiphers), \
|
||||
(fd, cipherOrder, numCiphers))
|
||||
|
||||
/* Deprecated experimental APIs */
|
||||
#define SSL_UseAltServerHelloType(fd, enable) SSL_DEPRECATED_EXPERIMENTAL_API
|
||||
#define SSL_SetupAntiReplay(a, b, c) SSL_DEPRECATED_EXPERIMENTAL_API
|
||||
#define SSL_InitAntiReplay(a, b, c) SSL_DEPRECATED_EXPERIMENTAL_API
|
||||
|
||||
SEC_END_PROTOS
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue