projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Following the license change, modify the boilerplates in ssl/
[openssl.git]
/
ssl
/
statem
/
extensions.c
diff --git
a/ssl/statem/extensions.c
b/ssl/statem/extensions.c
index 8d4939d601258a0e5d5e8f04632ad6c9f185064c..c5492184f7ee0428f94c4245ccd76ea39360565d 100644
(file)
--- a/
ssl/statem/extensions.c
+++ b/
ssl/statem/extensions.c
@@
-1,7
+1,7
@@
/*
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
/*
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the
OpenSSL license
(the "License"). You may not use
+ * Licensed under the
Apache License 2.0
(the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
@@
-962,7
+962,7
@@
static int final_server_name(SSL *s, unsigned int context, int sent)
*/
if (SSL_IS_FIRST_HANDSHAKE(s) && s->ctx != s->session_ctx) {
tsan_counter(&s->ctx->stats.sess_accept);
*/
if (SSL_IS_FIRST_HANDSHAKE(s) && s->ctx != s->session_ctx) {
tsan_counter(&s->ctx->stats.sess_accept);
- tsan_
counte
r(&s->session_ctx->stats.sess_accept);
+ tsan_
dec
r(&s->session_ctx->stats.sess_accept);
}
/*
}
/*
@@
-1198,7
+1198,7
@@
static EXT_RETURN tls_construct_certificate_authorities(SSL *s, WPACKET *pkt,
X509 *x,
size_t chainidx)
{
X509 *x,
size_t chainidx)
{
- const STACK_OF(X509_NAME) *ca_sk =
SSL_get0_CA_list
(s);
+ const STACK_OF(X509_NAME) *ca_sk =
get_ca_names
(s);
if (ca_sk == NULL || sk_X509_NAME_num(ca_sk) == 0)
return EXT_RETURN_NOT_SENT;
if (ca_sk == NULL || sk_X509_NAME_num(ca_sk) == 0)
return EXT_RETURN_NOT_SENT;
@@
-1211,7
+1211,7
@@
static EXT_RETURN tls_construct_certificate_authorities(SSL *s, WPACKET *pkt,
return EXT_RETURN_FAIL;
}
return EXT_RETURN_FAIL;
}
- if (!construct_ca_names(s, pkt)) {
+ if (!construct_ca_names(s,
ca_sk,
pkt)) {
/* SSLfatal() already called */
return EXT_RETURN_FAIL;
}
/* SSLfatal() already called */
return EXT_RETURN_FAIL;
}
@@
-1506,7
+1506,7
@@
int tls_psk_do_binder(SSL *s, const EVP_MD *md, const unsigned char *msgstart,
/* Generate the binder key */
if (!tls13_hkdf_expand(s, md, early_secret, label, labelsize, hash,
/* Generate the binder key */
if (!tls13_hkdf_expand(s, md, early_secret, label, labelsize, hash,
- hashsize, binderkey, hashsize)) {
+ hashsize, binderkey, hashsize
, 1
)) {
/* SSLfatal() already called */
goto err;
}
/* SSLfatal() already called */
goto err;
}