OpenSSL 1.1.1-pre2
This commit is contained in:
+1341
-2988
@@ -17,19 +17,10 @@
|
||||
#include <openssl/x509v3.h>
|
||||
#include <openssl/dh.h>
|
||||
#include <openssl/bn.h>
|
||||
#include "internal/nelem.h"
|
||||
#include "ssl_locl.h"
|
||||
#include <openssl/ct.h>
|
||||
|
||||
|
||||
#define CHECKLEN(curr, val, limit) \
|
||||
(((curr) >= (limit)) || (size_t)((limit) - (curr)) < (size_t)(val))
|
||||
|
||||
static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen,
|
||||
const unsigned char *sess_id, int sesslen,
|
||||
SSL_SESSION **psess);
|
||||
static int ssl_check_clienthello_tlsext_early(SSL *s);
|
||||
static int ssl_check_serverhello_tlsext(SSL *s);
|
||||
|
||||
SSL3_ENC_METHOD const TLSv1_enc_data = {
|
||||
tls1_enc,
|
||||
tls1_mac,
|
||||
@@ -37,14 +28,13 @@ SSL3_ENC_METHOD const TLSv1_enc_data = {
|
||||
tls1_generate_master_secret,
|
||||
tls1_change_cipher_state,
|
||||
tls1_final_finish_mac,
|
||||
TLS1_FINISH_MAC_LENGTH,
|
||||
TLS_MD_CLIENT_FINISH_CONST, TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||
TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE,
|
||||
tls1_alert_code,
|
||||
tls1_export_keying_material,
|
||||
0,
|
||||
SSL3_HM_HEADER_LENGTH,
|
||||
ssl3_set_handshake_header,
|
||||
tls_close_construct_packet,
|
||||
ssl3_handshake_write
|
||||
};
|
||||
|
||||
@@ -55,14 +45,13 @@ SSL3_ENC_METHOD const TLSv1_1_enc_data = {
|
||||
tls1_generate_master_secret,
|
||||
tls1_change_cipher_state,
|
||||
tls1_final_finish_mac,
|
||||
TLS1_FINISH_MAC_LENGTH,
|
||||
TLS_MD_CLIENT_FINISH_CONST, TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||
TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE,
|
||||
tls1_alert_code,
|
||||
tls1_export_keying_material,
|
||||
SSL_ENC_FLAG_EXPLICIT_IV,
|
||||
SSL3_HM_HEADER_LENGTH,
|
||||
ssl3_set_handshake_header,
|
||||
tls_close_construct_packet,
|
||||
ssl3_handshake_write
|
||||
};
|
||||
|
||||
@@ -73,15 +62,31 @@ SSL3_ENC_METHOD const TLSv1_2_enc_data = {
|
||||
tls1_generate_master_secret,
|
||||
tls1_change_cipher_state,
|
||||
tls1_final_finish_mac,
|
||||
TLS1_FINISH_MAC_LENGTH,
|
||||
TLS_MD_CLIENT_FINISH_CONST, TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||
TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE,
|
||||
tls1_alert_code,
|
||||
tls1_export_keying_material,
|
||||
SSL_ENC_FLAG_EXPLICIT_IV | SSL_ENC_FLAG_SIGALGS | SSL_ENC_FLAG_SHA256_PRF
|
||||
| SSL_ENC_FLAG_TLS1_2_CIPHERS,
|
||||
SSL3_HM_HEADER_LENGTH,
|
||||
ssl3_set_handshake_header,
|
||||
tls_close_construct_packet,
|
||||
ssl3_handshake_write
|
||||
};
|
||||
|
||||
SSL3_ENC_METHOD const TLSv1_3_enc_data = {
|
||||
tls13_enc,
|
||||
tls1_mac,
|
||||
tls13_setup_key_block,
|
||||
tls13_generate_master_secret,
|
||||
tls13_change_cipher_state,
|
||||
tls13_final_finish_mac,
|
||||
TLS_MD_CLIENT_FINISH_CONST, TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||
TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE,
|
||||
tls13_alert_code,
|
||||
tls13_export_keying_material,
|
||||
SSL_ENC_FLAG_SIGALGS | SSL_ENC_FLAG_SHA256_PRF,
|
||||
ssl3_set_handshake_header,
|
||||
tls_close_construct_packet,
|
||||
ssl3_handshake_write
|
||||
};
|
||||
|
||||
@@ -97,40 +102,40 @@ long tls1_default_timeout(void)
|
||||
int tls1_new(SSL *s)
|
||||
{
|
||||
if (!ssl3_new(s))
|
||||
return (0);
|
||||
s->method->ssl_clear(s);
|
||||
return (1);
|
||||
return 0;
|
||||
if (!s->method->ssl_clear(s))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
void tls1_free(SSL *s)
|
||||
{
|
||||
OPENSSL_free(s->tlsext_session_ticket);
|
||||
OPENSSL_free(s->ext.session_ticket);
|
||||
ssl3_free(s);
|
||||
}
|
||||
|
||||
void tls1_clear(SSL *s)
|
||||
int tls1_clear(SSL *s)
|
||||
{
|
||||
ssl3_clear(s);
|
||||
if (!ssl3_clear(s))
|
||||
return 0;
|
||||
|
||||
if (s->method->version == TLS_ANY_VERSION)
|
||||
s->version = TLS_MAX_VERSION;
|
||||
else
|
||||
s->version = s->method->version;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
|
||||
typedef struct {
|
||||
int nid; /* Curve NID */
|
||||
int secbits; /* Bits of security (from SP800-57) */
|
||||
unsigned int flags; /* Flags: currently just field type */
|
||||
} tls_curve_info;
|
||||
|
||||
/*
|
||||
* Table of curve information.
|
||||
* Do not delete entries or reorder this array! It is used as a lookup
|
||||
* table: the index of each entry is one less than the TLS curve id.
|
||||
*/
|
||||
static const tls_curve_info nid_list[] = {
|
||||
static const TLS_GROUP_INFO nid_list[] = {
|
||||
{NID_sect163k1, 80, TLS_CURVE_CHAR2}, /* sect163k1 (1) */
|
||||
{NID_sect163r1, 80, TLS_CURVE_CHAR2}, /* sect163r1 (2) */
|
||||
{NID_sect163r2, 80, TLS_CURVE_CHAR2}, /* sect163r2 (3) */
|
||||
@@ -159,7 +164,7 @@ static const tls_curve_info nid_list[] = {
|
||||
{NID_brainpoolP256r1, 128, TLS_CURVE_PRIME}, /* brainpoolP256r1 (26) */
|
||||
{NID_brainpoolP384r1, 192, TLS_CURVE_PRIME}, /* brainpoolP384r1 (27) */
|
||||
{NID_brainpoolP512r1, 256, TLS_CURVE_PRIME}, /* brainpool512r1 (28) */
|
||||
{NID_X25519, 128, TLS_CURVE_CUSTOM}, /* X25519 (29) */
|
||||
{EVP_PKEY_X25519, 128, TLS_CURVE_CUSTOM}, /* X25519 (29) */
|
||||
};
|
||||
|
||||
static const unsigned char ecformats_default[] = {
|
||||
@@ -169,160 +174,116 @@ static const unsigned char ecformats_default[] = {
|
||||
};
|
||||
|
||||
/* The default curves */
|
||||
static const unsigned char eccurves_default[] = {
|
||||
0, 29, /* X25519 (29) */
|
||||
0, 23, /* secp256r1 (23) */
|
||||
0, 25, /* secp521r1 (25) */
|
||||
0, 24, /* secp384r1 (24) */
|
||||
static const uint16_t eccurves_default[] = {
|
||||
29, /* X25519 (29) */
|
||||
23, /* secp256r1 (23) */
|
||||
25, /* secp521r1 (25) */
|
||||
24, /* secp384r1 (24) */
|
||||
};
|
||||
|
||||
static const unsigned char suiteb_curves[] = {
|
||||
0, TLSEXT_curve_P_256,
|
||||
0, TLSEXT_curve_P_384
|
||||
static const uint16_t suiteb_curves[] = {
|
||||
TLSEXT_curve_P_256,
|
||||
TLSEXT_curve_P_384
|
||||
};
|
||||
|
||||
int tls1_ec_curve_id2nid(int curve_id, unsigned int *pflags)
|
||||
const TLS_GROUP_INFO *tls1_group_id_lookup(uint16_t group_id)
|
||||
{
|
||||
const tls_curve_info *cinfo;
|
||||
/* ECC curves from RFC 4492 and RFC 7027 */
|
||||
if ((curve_id < 1) || ((unsigned int)curve_id > OSSL_NELEM(nid_list)))
|
||||
return 0;
|
||||
cinfo = nid_list + curve_id - 1;
|
||||
if (pflags)
|
||||
*pflags = cinfo->flags;
|
||||
return cinfo->nid;
|
||||
if (group_id < 1 || group_id > OSSL_NELEM(nid_list))
|
||||
return NULL;
|
||||
return &nid_list[group_id - 1];
|
||||
}
|
||||
|
||||
int tls1_ec_nid2curve_id(int nid)
|
||||
static uint16_t tls1_nid2group_id(int nid)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < OSSL_NELEM(nid_list); i++) {
|
||||
if (nid_list[i].nid == nid)
|
||||
return i + 1;
|
||||
return (uint16_t)(i + 1);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get curves list, if "sess" is set return client curves otherwise
|
||||
* preferred list.
|
||||
* Sets |num_curves| to the number of curves in the list, i.e.,
|
||||
* the length of |pcurves| is 2 * num_curves.
|
||||
* Returns 1 on success and 0 if the client curves list has invalid format.
|
||||
* The latter indicates an internal error: we should not be accepting such
|
||||
* lists in the first place.
|
||||
* TODO(emilia): we should really be storing the curves list in explicitly
|
||||
* parsed form instead. (However, this would affect binary compatibility
|
||||
* so cannot happen in the 1.0.x series.)
|
||||
* Set *pgroups to the supported groups list and *pgroupslen to
|
||||
* the number of groups supported.
|
||||
*/
|
||||
static int tls1_get_curvelist(SSL *s, int sess,
|
||||
const unsigned char **pcurves, size_t *num_curves)
|
||||
void tls1_get_supported_groups(SSL *s, const uint16_t **pgroups,
|
||||
size_t *pgroupslen)
|
||||
{
|
||||
size_t pcurveslen = 0;
|
||||
|
||||
if (sess) {
|
||||
*pcurves = s->session->tlsext_ellipticcurvelist;
|
||||
pcurveslen = s->session->tlsext_ellipticcurvelist_length;
|
||||
} else {
|
||||
/* For Suite B mode only include P-256, P-384 */
|
||||
switch (tls1_suiteb(s)) {
|
||||
case SSL_CERT_FLAG_SUITEB_128_LOS:
|
||||
*pcurves = suiteb_curves;
|
||||
pcurveslen = sizeof(suiteb_curves);
|
||||
break;
|
||||
/* For Suite B mode only include P-256, P-384 */
|
||||
switch (tls1_suiteb(s)) {
|
||||
case SSL_CERT_FLAG_SUITEB_128_LOS:
|
||||
*pgroups = suiteb_curves;
|
||||
*pgroupslen = OSSL_NELEM(suiteb_curves);
|
||||
break;
|
||||
|
||||
case SSL_CERT_FLAG_SUITEB_128_LOS_ONLY:
|
||||
*pcurves = suiteb_curves;
|
||||
pcurveslen = 2;
|
||||
break;
|
||||
case SSL_CERT_FLAG_SUITEB_128_LOS_ONLY:
|
||||
*pgroups = suiteb_curves;
|
||||
*pgroupslen = 1;
|
||||
break;
|
||||
|
||||
case SSL_CERT_FLAG_SUITEB_192_LOS:
|
||||
*pcurves = suiteb_curves + 2;
|
||||
pcurveslen = 2;
|
||||
break;
|
||||
default:
|
||||
*pcurves = s->tlsext_ellipticcurvelist;
|
||||
pcurveslen = s->tlsext_ellipticcurvelist_length;
|
||||
}
|
||||
if (!*pcurves) {
|
||||
*pcurves = eccurves_default;
|
||||
pcurveslen = sizeof(eccurves_default);
|
||||
case SSL_CERT_FLAG_SUITEB_192_LOS:
|
||||
*pgroups = suiteb_curves + 1;
|
||||
*pgroupslen = 1;
|
||||
break;
|
||||
|
||||
default:
|
||||
if (s->ext.supportedgroups == NULL) {
|
||||
*pgroups = eccurves_default;
|
||||
*pgroupslen = OSSL_NELEM(eccurves_default);
|
||||
} else {
|
||||
*pgroups = s->ext.supportedgroups;
|
||||
*pgroupslen = s->ext.supportedgroups_len;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
/* We do not allow odd length arrays to enter the system. */
|
||||
if (pcurveslen & 1) {
|
||||
SSLerr(SSL_F_TLS1_GET_CURVELIST, ERR_R_INTERNAL_ERROR);
|
||||
*num_curves = 0;
|
||||
return 0;
|
||||
}
|
||||
*num_curves = pcurveslen / 2;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* See if curve is allowed by security callback */
|
||||
static int tls_curve_allowed(SSL *s, const unsigned char *curve, int op)
|
||||
int tls_curve_allowed(SSL *s, uint16_t curve, int op)
|
||||
{
|
||||
const tls_curve_info *cinfo;
|
||||
if (curve[0])
|
||||
return 1;
|
||||
if ((curve[1] < 1) || ((size_t)curve[1] > OSSL_NELEM(nid_list)))
|
||||
const TLS_GROUP_INFO *cinfo = tls1_group_id_lookup(curve);
|
||||
unsigned char ctmp[2];
|
||||
|
||||
if (cinfo == NULL)
|
||||
return 0;
|
||||
cinfo = &nid_list[curve[1] - 1];
|
||||
# ifdef OPENSSL_NO_EC2M
|
||||
if (cinfo->flags & TLS_CURVE_CHAR2)
|
||||
return 0;
|
||||
# endif
|
||||
return ssl_security(s, op, cinfo->secbits, cinfo->nid, (void *)curve);
|
||||
ctmp[0] = curve >> 8;
|
||||
ctmp[1] = curve & 0xff;
|
||||
return ssl_security(s, op, cinfo->secbits, cinfo->nid, (void *)ctmp);
|
||||
}
|
||||
|
||||
/* Check a curve is one of our preferences */
|
||||
int tls1_check_curve(SSL *s, const unsigned char *p, size_t len)
|
||||
/* Return 1 if "id" is in "list" */
|
||||
static int tls1_in_list(uint16_t id, const uint16_t *list, size_t listlen)
|
||||
{
|
||||
const unsigned char *curves;
|
||||
size_t num_curves, i;
|
||||
unsigned int suiteb_flags = tls1_suiteb(s);
|
||||
if (len != 3 || p[0] != NAMED_CURVE_TYPE)
|
||||
return 0;
|
||||
/* Check curve matches Suite B preferences */
|
||||
if (suiteb_flags) {
|
||||
unsigned long cid = s->s3->tmp.new_cipher->id;
|
||||
if (p[1])
|
||||
return 0;
|
||||
if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256) {
|
||||
if (p[2] != TLSEXT_curve_P_256)
|
||||
return 0;
|
||||
} else if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384) {
|
||||
if (p[2] != TLSEXT_curve_P_384)
|
||||
return 0;
|
||||
} else /* Should never happen */
|
||||
return 0;
|
||||
}
|
||||
if (!tls1_get_curvelist(s, 0, &curves, &num_curves))
|
||||
return 0;
|
||||
for (i = 0; i < num_curves; i++, curves += 2) {
|
||||
if (p[1] == curves[0] && p[2] == curves[1])
|
||||
return tls_curve_allowed(s, p + 1, SSL_SECOP_CURVE_CHECK);
|
||||
}
|
||||
size_t i;
|
||||
for (i = 0; i < listlen; i++)
|
||||
if (list[i] == id)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*-
|
||||
* For nmatch >= 0, return the NID of the |nmatch|th shared curve or NID_undef
|
||||
* For nmatch >= 0, return the id of the |nmatch|th shared group or 0
|
||||
* if there is no match.
|
||||
* For nmatch == -1, return number of matches
|
||||
* For nmatch == -2, return the NID of the curve to use for
|
||||
* an EC tmp key, or NID_undef if there is no match.
|
||||
* For nmatch == -2, return the id of the group to use for
|
||||
* a tmp key, or 0 if there is no match.
|
||||
*/
|
||||
int tls1_shared_curve(SSL *s, int nmatch)
|
||||
uint16_t tls1_shared_group(SSL *s, int nmatch)
|
||||
{
|
||||
const unsigned char *pref, *supp;
|
||||
size_t num_pref, num_supp, i, j;
|
||||
const uint16_t *pref, *supp;
|
||||
size_t num_pref, num_supp, i;
|
||||
int k;
|
||||
|
||||
/* Can't do anything on client side */
|
||||
if (s->server == 0)
|
||||
return -1;
|
||||
return 0;
|
||||
if (nmatch == -2) {
|
||||
if (tls1_suiteb(s)) {
|
||||
/*
|
||||
@@ -332,79 +293,72 @@ int tls1_shared_curve(SSL *s, int nmatch)
|
||||
unsigned long cid = s->s3->tmp.new_cipher->id;
|
||||
|
||||
if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256)
|
||||
return NID_X9_62_prime256v1; /* P-256 */
|
||||
return TLSEXT_curve_P_256;
|
||||
if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384)
|
||||
return NID_secp384r1; /* P-384 */
|
||||
return TLSEXT_curve_P_384;
|
||||
/* Should never happen */
|
||||
return NID_undef;
|
||||
return 0;
|
||||
}
|
||||
/* If not Suite B just return first preference shared curve */
|
||||
nmatch = 0;
|
||||
}
|
||||
/*
|
||||
* Avoid truncation. tls1_get_curvelist takes an int
|
||||
* but s->options is a long...
|
||||
* If server preference set, our groups are the preference order
|
||||
* otherwise peer decides.
|
||||
*/
|
||||
if (!tls1_get_curvelist(s,
|
||||
(s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) != 0,
|
||||
&supp, &num_supp))
|
||||
/* In practice, NID_undef == 0 but let's be precise. */
|
||||
return nmatch == -1 ? 0 : NID_undef;
|
||||
if (!tls1_get_curvelist(s,
|
||||
(s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) == 0,
|
||||
&pref, &num_pref))
|
||||
return nmatch == -1 ? 0 : NID_undef;
|
||||
if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) {
|
||||
tls1_get_supported_groups(s, &pref, &num_pref);
|
||||
tls1_get_peer_groups(s, &supp, &num_supp);
|
||||
} else {
|
||||
tls1_get_peer_groups(s, &pref, &num_pref);
|
||||
tls1_get_supported_groups(s, &supp, &num_supp);
|
||||
}
|
||||
|
||||
for (k = 0, i = 0; i < num_pref; i++, pref += 2) {
|
||||
const unsigned char *tsupp = supp;
|
||||
for (k = 0, i = 0; i < num_pref; i++) {
|
||||
uint16_t id = pref[i];
|
||||
|
||||
for (j = 0; j < num_supp; j++, tsupp += 2) {
|
||||
if (pref[0] == tsupp[0] && pref[1] == tsupp[1]) {
|
||||
if (!tls_curve_allowed(s, pref, SSL_SECOP_CURVE_SHARED))
|
||||
if (!tls1_in_list(id, supp, num_supp)
|
||||
|| !tls_curve_allowed(s, id, SSL_SECOP_CURVE_SHARED))
|
||||
continue;
|
||||
if (nmatch == k) {
|
||||
int id = (pref[0] << 8) | pref[1];
|
||||
|
||||
return tls1_ec_curve_id2nid(id, NULL);
|
||||
}
|
||||
k++;
|
||||
}
|
||||
}
|
||||
if (nmatch == k)
|
||||
return id;
|
||||
k++;
|
||||
}
|
||||
if (nmatch == -1)
|
||||
return k;
|
||||
/* Out of range (nmatch > k). */
|
||||
return NID_undef;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int tls1_set_curves(unsigned char **pext, size_t *pextlen,
|
||||
int *curves, size_t ncurves)
|
||||
int tls1_set_groups(uint16_t **pext, size_t *pextlen,
|
||||
int *groups, size_t ngroups)
|
||||
{
|
||||
unsigned char *clist, *p;
|
||||
uint16_t *glist;
|
||||
size_t i;
|
||||
/*
|
||||
* Bitmap of curves included to detect duplicates: only works while curve
|
||||
* Bitmap of groups included to detect duplicates: only works while group
|
||||
* ids < 32
|
||||
*/
|
||||
unsigned long dup_list = 0;
|
||||
clist = OPENSSL_malloc(ncurves * 2);
|
||||
if (clist == NULL)
|
||||
glist = OPENSSL_malloc(ngroups * sizeof(*glist));
|
||||
if (glist == NULL)
|
||||
return 0;
|
||||
for (i = 0, p = clist; i < ncurves; i++) {
|
||||
for (i = 0; i < ngroups; i++) {
|
||||
unsigned long idmask;
|
||||
int id;
|
||||
id = tls1_ec_nid2curve_id(curves[i]);
|
||||
uint16_t id;
|
||||
/* TODO(TLS1.3): Convert for DH groups */
|
||||
id = tls1_nid2group_id(groups[i]);
|
||||
idmask = 1L << id;
|
||||
if (!id || (dup_list & idmask)) {
|
||||
OPENSSL_free(clist);
|
||||
OPENSSL_free(glist);
|
||||
return 0;
|
||||
}
|
||||
dup_list |= idmask;
|
||||
s2n(id, p);
|
||||
glist[i] = id;
|
||||
}
|
||||
OPENSSL_free(*pext);
|
||||
*pext = clist;
|
||||
*pextlen = ncurves * 2;
|
||||
*pext = glist;
|
||||
*pextlen = ngroups;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -443,8 +397,8 @@ static int nid_cb(const char *elem, int len, void *arg)
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Set curves based on a colon separate list */
|
||||
int tls1_set_curves_list(unsigned char **pext, size_t *pextlen, const char *str)
|
||||
/* Set groups based on a colon separate list */
|
||||
int tls1_set_groups_list(uint16_t **pext, size_t *pextlen, const char *str)
|
||||
{
|
||||
nid_cb_st ncb;
|
||||
ncb.nidcnt = 0;
|
||||
@@ -452,103 +406,124 @@ int tls1_set_curves_list(unsigned char **pext, size_t *pextlen, const char *str)
|
||||
return 0;
|
||||
if (pext == NULL)
|
||||
return 1;
|
||||
return tls1_set_curves(pext, pextlen, ncb.nid_arr, ncb.nidcnt);
|
||||
return tls1_set_groups(pext, pextlen, ncb.nid_arr, ncb.nidcnt);
|
||||
}
|
||||
|
||||
/* For an EC key set TLS id and required compression based on parameters */
|
||||
static int tls1_set_ec_id(unsigned char *curve_id, unsigned char *comp_id,
|
||||
EC_KEY *ec)
|
||||
/* Return group id of a key */
|
||||
static uint16_t tls1_get_group_id(EVP_PKEY *pkey)
|
||||
{
|
||||
int id;
|
||||
EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
|
||||
const EC_GROUP *grp;
|
||||
if (!ec)
|
||||
|
||||
if (ec == NULL)
|
||||
return 0;
|
||||
/* Determine if it is a prime field */
|
||||
grp = EC_KEY_get0_group(ec);
|
||||
if (!grp)
|
||||
return 0;
|
||||
/* Determine curve ID */
|
||||
id = EC_GROUP_get_curve_name(grp);
|
||||
id = tls1_ec_nid2curve_id(id);
|
||||
/* If no id return error: we don't support arbitrary explicit curves */
|
||||
if (id == 0)
|
||||
return 0;
|
||||
curve_id[0] = 0;
|
||||
curve_id[1] = (unsigned char)id;
|
||||
if (comp_id) {
|
||||
if (EC_KEY_get0_public_key(ec) == NULL)
|
||||
return 0;
|
||||
if (EC_KEY_get_conv_form(ec) == POINT_CONVERSION_UNCOMPRESSED) {
|
||||
*comp_id = TLSEXT_ECPOINTFORMAT_uncompressed;
|
||||
} else {
|
||||
if ((nid_list[id - 1].flags & TLS_CURVE_TYPE) == TLS_CURVE_PRIME)
|
||||
*comp_id = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime;
|
||||
else
|
||||
*comp_id = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
return tls1_nid2group_id(EC_GROUP_get_curve_name(grp));
|
||||
}
|
||||
|
||||
/* Check an EC key is compatible with extensions */
|
||||
static int tls1_check_ec_key(SSL *s,
|
||||
unsigned char *curve_id, unsigned char *comp_id)
|
||||
/* Check a key is compatible with compression extension */
|
||||
static int tls1_check_pkey_comp(SSL *s, EVP_PKEY *pkey)
|
||||
{
|
||||
const unsigned char *pformats, *pcurves;
|
||||
size_t num_formats, num_curves, i;
|
||||
int j;
|
||||
const EC_KEY *ec;
|
||||
const EC_GROUP *grp;
|
||||
unsigned char comp_id;
|
||||
size_t i;
|
||||
|
||||
/* If not an EC key nothing to check */
|
||||
if (EVP_PKEY_id(pkey) != EVP_PKEY_EC)
|
||||
return 1;
|
||||
ec = EVP_PKEY_get0_EC_KEY(pkey);
|
||||
grp = EC_KEY_get0_group(ec);
|
||||
|
||||
/* Get required compression id */
|
||||
if (EC_KEY_get_conv_form(ec) == POINT_CONVERSION_UNCOMPRESSED) {
|
||||
comp_id = TLSEXT_ECPOINTFORMAT_uncompressed;
|
||||
} else if (SSL_IS_TLS13(s)) {
|
||||
/* Compression not allowed in TLS 1.3 */
|
||||
return 0;
|
||||
} else {
|
||||
int field_type = EC_METHOD_get_field_type(EC_GROUP_method_of(grp));
|
||||
|
||||
if (field_type == NID_X9_62_prime_field)
|
||||
comp_id = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime;
|
||||
else if (field_type == NID_X9_62_characteristic_two_field)
|
||||
comp_id = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
* If point formats extension present check it, otherwise everything is
|
||||
* supported (see RFC4492).
|
||||
*/
|
||||
if (comp_id && s->session->tlsext_ecpointformatlist) {
|
||||
pformats = s->session->tlsext_ecpointformatlist;
|
||||
num_formats = s->session->tlsext_ecpointformatlist_length;
|
||||
for (i = 0; i < num_formats; i++, pformats++) {
|
||||
if (*comp_id == *pformats)
|
||||
break;
|
||||
}
|
||||
if (i == num_formats)
|
||||
return 0;
|
||||
}
|
||||
if (!curve_id)
|
||||
if (s->session->ext.ecpointformats == NULL)
|
||||
return 1;
|
||||
/* Check curve is consistent with client and server preferences */
|
||||
for (j = 0; j <= 1; j++) {
|
||||
if (!tls1_get_curvelist(s, j, &pcurves, &num_curves))
|
||||
return 0;
|
||||
if (j == 1 && num_curves == 0) {
|
||||
/*
|
||||
* If we've not received any curves then skip this check.
|
||||
* RFC 4492 does not require the supported elliptic curves extension
|
||||
* so if it is not sent we can just choose any curve.
|
||||
* It is invalid to send an empty list in the elliptic curves
|
||||
* extension, so num_curves == 0 always means no extension.
|
||||
*/
|
||||
break;
|
||||
}
|
||||
for (i = 0; i < num_curves; i++, pcurves += 2) {
|
||||
if (pcurves[0] == curve_id[0] && pcurves[1] == curve_id[1])
|
||||
break;
|
||||
}
|
||||
if (i == num_curves)
|
||||
return 0;
|
||||
/* For clients can only check sent curve list */
|
||||
if (!s->server)
|
||||
break;
|
||||
|
||||
for (i = 0; i < s->session->ext.ecpointformats_len; i++) {
|
||||
if (s->session->ext.ecpointformats[i] == comp_id)
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void tls1_get_formatlist(SSL *s, const unsigned char **pformats,
|
||||
size_t *num_formats)
|
||||
/* Check a group id matches preferences */
|
||||
int tls1_check_group_id(SSL *s, uint16_t group_id)
|
||||
{
|
||||
const uint16_t *groups;
|
||||
size_t groups_len;
|
||||
|
||||
if (group_id == 0)
|
||||
return 0;
|
||||
|
||||
/* Check for Suite B compliance */
|
||||
if (tls1_suiteb(s) && s->s3->tmp.new_cipher != NULL) {
|
||||
unsigned long cid = s->s3->tmp.new_cipher->id;
|
||||
|
||||
if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256) {
|
||||
if (group_id != TLSEXT_curve_P_256)
|
||||
return 0;
|
||||
} else if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384) {
|
||||
if (group_id != TLSEXT_curve_P_384)
|
||||
return 0;
|
||||
} else {
|
||||
/* Should never happen */
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Check group is one of our preferences */
|
||||
tls1_get_supported_groups(s, &groups, &groups_len);
|
||||
if (!tls1_in_list(group_id, groups, groups_len))
|
||||
return 0;
|
||||
|
||||
if (!tls_curve_allowed(s, group_id, SSL_SECOP_CURVE_CHECK))
|
||||
return 0;
|
||||
|
||||
/* For clients, nothing more to check */
|
||||
if (!s->server)
|
||||
return 1;
|
||||
|
||||
/* Check group is one of peers preferences */
|
||||
tls1_get_peer_groups(s, &groups, &groups_len);
|
||||
|
||||
/*
|
||||
* RFC 4492 does not require the supported elliptic curves extension
|
||||
* so if it is not sent we can just choose any curve.
|
||||
* It is invalid to send an empty list in the supported groups
|
||||
* extension, so groups_len == 0 always means no extension.
|
||||
*/
|
||||
if (groups_len == 0)
|
||||
return 1;
|
||||
return tls1_in_list(group_id, groups, groups_len);
|
||||
}
|
||||
|
||||
void tls1_get_formatlist(SSL *s, const unsigned char **pformats,
|
||||
size_t *num_formats)
|
||||
{
|
||||
/*
|
||||
* If we have a custom point format list use it otherwise use default
|
||||
*/
|
||||
if (s->tlsext_ecpointformatlist) {
|
||||
*pformats = s->tlsext_ecpointformatlist;
|
||||
*num_formats = s->tlsext_ecpointformatlist_length;
|
||||
if (s->ext.ecpointformats) {
|
||||
*pformats = s->ext.ecpointformats;
|
||||
*num_formats = s->ext.ecpointformats_len;
|
||||
} else {
|
||||
*pformats = ecformats_default;
|
||||
/* For Suite B we don't support char2 fields */
|
||||
@@ -563,60 +538,47 @@ static void tls1_get_formatlist(SSL *s, const unsigned char **pformats,
|
||||
* Check cert parameters compatible with extensions: currently just checks EC
|
||||
* certificates have compatible curves and compression.
|
||||
*/
|
||||
static int tls1_check_cert_param(SSL *s, X509 *x, int set_ee_md)
|
||||
static int tls1_check_cert_param(SSL *s, X509 *x, int check_ee_md)
|
||||
{
|
||||
unsigned char comp_id, curve_id[2];
|
||||
uint16_t group_id;
|
||||
EVP_PKEY *pkey;
|
||||
int rv;
|
||||
pkey = X509_get0_pubkey(x);
|
||||
if (!pkey)
|
||||
if (pkey == NULL)
|
||||
return 0;
|
||||
/* If not EC nothing to do */
|
||||
if (EVP_PKEY_id(pkey) != EVP_PKEY_EC)
|
||||
return 1;
|
||||
rv = tls1_set_ec_id(curve_id, &comp_id, EVP_PKEY_get0_EC_KEY(pkey));
|
||||
if (!rv)
|
||||
/* Check compression */
|
||||
if (!tls1_check_pkey_comp(s, pkey))
|
||||
return 0;
|
||||
/*
|
||||
* Can't check curve_id for client certs as we don't have a supported
|
||||
* curves extension.
|
||||
*/
|
||||
rv = tls1_check_ec_key(s, s->server ? curve_id : NULL, &comp_id);
|
||||
if (!rv)
|
||||
group_id = tls1_get_group_id(pkey);
|
||||
if (!tls1_check_group_id(s, group_id))
|
||||
return 0;
|
||||
/*
|
||||
* Special case for suite B. We *MUST* sign using SHA256+P-256 or
|
||||
* SHA384+P-384, adjust digest if necessary.
|
||||
* SHA384+P-384.
|
||||
*/
|
||||
if (set_ee_md && tls1_suiteb(s)) {
|
||||
if (check_ee_md && tls1_suiteb(s)) {
|
||||
int check_md;
|
||||
size_t i;
|
||||
CERT *c = s->cert;
|
||||
if (curve_id[0])
|
||||
return 0;
|
||||
|
||||
/* Check to see we have necessary signing algorithm */
|
||||
if (curve_id[1] == TLSEXT_curve_P_256)
|
||||
if (group_id == TLSEXT_curve_P_256)
|
||||
check_md = NID_ecdsa_with_SHA256;
|
||||
else if (curve_id[1] == TLSEXT_curve_P_384)
|
||||
else if (group_id == TLSEXT_curve_P_384)
|
||||
check_md = NID_ecdsa_with_SHA384;
|
||||
else
|
||||
return 0; /* Should never happen */
|
||||
for (i = 0; i < c->shared_sigalgslen; i++)
|
||||
if (check_md == c->shared_sigalgs[i].signandhash_nid)
|
||||
break;
|
||||
if (i == c->shared_sigalgslen)
|
||||
return 0;
|
||||
if (set_ee_md == 2) {
|
||||
if (check_md == NID_ecdsa_with_SHA256)
|
||||
s->s3->tmp.md[SSL_PKEY_ECC] = EVP_sha256();
|
||||
else
|
||||
s->s3->tmp.md[SSL_PKEY_ECC] = EVP_sha384();
|
||||
for (i = 0; i < c->shared_sigalgslen; i++) {
|
||||
if (check_md == c->shared_sigalgs[i]->sigandhash)
|
||||
return 1;;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return rv;
|
||||
return 1;
|
||||
}
|
||||
|
||||
# ifndef OPENSSL_NO_EC
|
||||
/*
|
||||
* tls1_check_ec_tmp_key - Check EC temporary key compatibility
|
||||
* @s: SSL connection
|
||||
@@ -629,31 +591,20 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int set_ee_md)
|
||||
*/
|
||||
int tls1_check_ec_tmp_key(SSL *s, unsigned long cid)
|
||||
{
|
||||
/* If not Suite B just need a shared group */
|
||||
if (!tls1_suiteb(s))
|
||||
return tls1_shared_group(s, 0) != 0;
|
||||
/*
|
||||
* If Suite B, AES128 MUST use P-256 and AES256 MUST use P-384, no other
|
||||
* curves permitted.
|
||||
*/
|
||||
if (tls1_suiteb(s)) {
|
||||
unsigned char curve_id[2];
|
||||
/* Curve to check determined by ciphersuite */
|
||||
if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256)
|
||||
curve_id[1] = TLSEXT_curve_P_256;
|
||||
else if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384)
|
||||
curve_id[1] = TLSEXT_curve_P_384;
|
||||
else
|
||||
return 0;
|
||||
curve_id[0] = 0;
|
||||
/* Check this curve is acceptable */
|
||||
if (!tls1_check_ec_key(s, curve_id, NULL))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
/* Need a shared curve */
|
||||
if (tls1_shared_curve(s, 0))
|
||||
return 1;
|
||||
if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256)
|
||||
return tls1_check_group_id(s, TLSEXT_curve_P_256);
|
||||
if (cid == TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384)
|
||||
return tls1_check_group_id(s, TLSEXT_curve_P_384);
|
||||
|
||||
return 0;
|
||||
}
|
||||
# endif /* OPENSSL_NO_EC */
|
||||
|
||||
#else
|
||||
|
||||
@@ -664,54 +615,261 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int set_ee_md)
|
||||
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
|
||||
/*
|
||||
* List of supported signature algorithms and hashes. Should make this
|
||||
* customisable at some point, for now include everything we support.
|
||||
*/
|
||||
|
||||
#ifdef OPENSSL_NO_RSA
|
||||
# define tlsext_sigalg_rsa(md) /* */
|
||||
#else
|
||||
# define tlsext_sigalg_rsa(md) md, TLSEXT_signature_rsa,
|
||||
/* Default sigalg schemes */
|
||||
static const uint16_t tls12_sigalgs[] = {
|
||||
#ifndef OPENSSL_NO_EC
|
||||
TLSEXT_SIGALG_ecdsa_secp256r1_sha256,
|
||||
TLSEXT_SIGALG_ecdsa_secp384r1_sha384,
|
||||
TLSEXT_SIGALG_ecdsa_secp521r1_sha512,
|
||||
TLSEXT_SIGALG_ed25519,
|
||||
#endif
|
||||
|
||||
#ifdef OPENSSL_NO_DSA
|
||||
# define tlsext_sigalg_dsa(md) /* */
|
||||
#else
|
||||
# define tlsext_sigalg_dsa(md) md, TLSEXT_signature_dsa,
|
||||
TLSEXT_SIGALG_rsa_pss_pss_sha256,
|
||||
TLSEXT_SIGALG_rsa_pss_pss_sha384,
|
||||
TLSEXT_SIGALG_rsa_pss_pss_sha512,
|
||||
TLSEXT_SIGALG_rsa_pss_rsae_sha256,
|
||||
TLSEXT_SIGALG_rsa_pss_rsae_sha384,
|
||||
TLSEXT_SIGALG_rsa_pss_rsae_sha512,
|
||||
|
||||
TLSEXT_SIGALG_rsa_pkcs1_sha256,
|
||||
TLSEXT_SIGALG_rsa_pkcs1_sha384,
|
||||
TLSEXT_SIGALG_rsa_pkcs1_sha512,
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
TLSEXT_SIGALG_ecdsa_sha224,
|
||||
TLSEXT_SIGALG_ecdsa_sha1,
|
||||
#endif
|
||||
TLSEXT_SIGALG_rsa_pkcs1_sha224,
|
||||
TLSEXT_SIGALG_rsa_pkcs1_sha1,
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
TLSEXT_SIGALG_dsa_sha224,
|
||||
TLSEXT_SIGALG_dsa_sha1,
|
||||
|
||||
#ifdef OPENSSL_NO_EC
|
||||
# define tlsext_sigalg_ecdsa(md)/* */
|
||||
#else
|
||||
# define tlsext_sigalg_ecdsa(md) md, TLSEXT_signature_ecdsa,
|
||||
#endif
|
||||
|
||||
#define tlsext_sigalg(md) \
|
||||
tlsext_sigalg_rsa(md) \
|
||||
tlsext_sigalg_dsa(md) \
|
||||
tlsext_sigalg_ecdsa(md)
|
||||
|
||||
static const unsigned char tls12_sigalgs[] = {
|
||||
tlsext_sigalg(TLSEXT_hash_sha512)
|
||||
tlsext_sigalg(TLSEXT_hash_sha384)
|
||||
tlsext_sigalg(TLSEXT_hash_sha256)
|
||||
tlsext_sigalg(TLSEXT_hash_sha224)
|
||||
tlsext_sigalg(TLSEXT_hash_sha1)
|
||||
#ifndef OPENSSL_NO_GOST
|
||||
TLSEXT_hash_gostr3411, TLSEXT_signature_gostr34102001,
|
||||
TLSEXT_hash_gostr34112012_256, TLSEXT_signature_gostr34102012_256,
|
||||
TLSEXT_hash_gostr34112012_512, TLSEXT_signature_gostr34102012_512
|
||||
TLSEXT_SIGALG_dsa_sha256,
|
||||
TLSEXT_SIGALG_dsa_sha384,
|
||||
TLSEXT_SIGALG_dsa_sha512
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
static const unsigned char suiteb_sigalgs[] = {
|
||||
tlsext_sigalg_ecdsa(TLSEXT_hash_sha256)
|
||||
tlsext_sigalg_ecdsa(TLSEXT_hash_sha384)
|
||||
static const uint16_t suiteb_sigalgs[] = {
|
||||
TLSEXT_SIGALG_ecdsa_secp256r1_sha256,
|
||||
TLSEXT_SIGALG_ecdsa_secp384r1_sha384
|
||||
};
|
||||
#endif
|
||||
size_t tls12_get_psigalgs(SSL *s, int sent, const unsigned char **psigs)
|
||||
|
||||
static const SIGALG_LOOKUP sigalg_lookup_tbl[] = {
|
||||
#ifndef OPENSSL_NO_EC
|
||||
{"ecdsa_secp256r1_sha256", TLSEXT_SIGALG_ecdsa_secp256r1_sha256,
|
||||
NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
|
||||
NID_ecdsa_with_SHA256, NID_X9_62_prime256v1},
|
||||
{"ecdsa_secp384r1_sha384", TLSEXT_SIGALG_ecdsa_secp384r1_sha384,
|
||||
NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
|
||||
NID_ecdsa_with_SHA384, NID_secp384r1},
|
||||
{"ecdsa_secp521r1_sha512", TLSEXT_SIGALG_ecdsa_secp521r1_sha512,
|
||||
NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
|
||||
NID_ecdsa_with_SHA512, NID_secp521r1},
|
||||
{"ed25519", TLSEXT_SIGALG_ed25519,
|
||||
NID_undef, -1, EVP_PKEY_ED25519, SSL_PKEY_ED25519,
|
||||
NID_undef, NID_undef},
|
||||
{NULL, TLSEXT_SIGALG_ecdsa_sha224,
|
||||
NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
|
||||
NID_ecdsa_with_SHA224, NID_undef},
|
||||
{NULL, TLSEXT_SIGALG_ecdsa_sha1,
|
||||
NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
|
||||
NID_ecdsa_with_SHA1, NID_undef},
|
||||
#endif
|
||||
{"rsa_pss_rsae_sha256", TLSEXT_SIGALG_rsa_pss_rsae_sha256,
|
||||
NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
|
||||
NID_undef, NID_undef},
|
||||
{"rsa_pss_rsae_sha384", TLSEXT_SIGALG_rsa_pss_rsae_sha384,
|
||||
NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
|
||||
NID_undef, NID_undef},
|
||||
{"rsa_pss_rsae_sha512", TLSEXT_SIGALG_rsa_pss_rsae_sha512,
|
||||
NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
|
||||
NID_undef, NID_undef},
|
||||
{"rsa_pss_pss_sha256", TLSEXT_SIGALG_rsa_pss_pss_sha256,
|
||||
NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
|
||||
NID_undef, NID_undef},
|
||||
{"rsa_pss_pss_sha384", TLSEXT_SIGALG_rsa_pss_pss_sha384,
|
||||
NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
|
||||
NID_undef, NID_undef},
|
||||
{"rsa_pss_pss_sha512", TLSEXT_SIGALG_rsa_pss_pss_sha512,
|
||||
NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
|
||||
NID_undef, NID_undef},
|
||||
{"rsa_pkcs1_sha256", TLSEXT_SIGALG_rsa_pkcs1_sha256,
|
||||
NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
|
||||
NID_sha256WithRSAEncryption, NID_undef},
|
||||
{"rsa_pkcs1_sha384", TLSEXT_SIGALG_rsa_pkcs1_sha384,
|
||||
NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
|
||||
NID_sha384WithRSAEncryption, NID_undef},
|
||||
{"rsa_pkcs1_sha512", TLSEXT_SIGALG_rsa_pkcs1_sha512,
|
||||
NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
|
||||
NID_sha512WithRSAEncryption, NID_undef},
|
||||
{"rsa_pkcs1_sha224", TLSEXT_SIGALG_rsa_pkcs1_sha224,
|
||||
NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
|
||||
NID_sha224WithRSAEncryption, NID_undef},
|
||||
{"rsa_pkcs1_sha1", TLSEXT_SIGALG_rsa_pkcs1_sha1,
|
||||
NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
|
||||
NID_sha1WithRSAEncryption, NID_undef},
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
{NULL, TLSEXT_SIGALG_dsa_sha256,
|
||||
NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
|
||||
NID_dsa_with_SHA256, NID_undef},
|
||||
{NULL, TLSEXT_SIGALG_dsa_sha384,
|
||||
NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
|
||||
NID_undef, NID_undef},
|
||||
{NULL, TLSEXT_SIGALG_dsa_sha512,
|
||||
NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
|
||||
NID_undef, NID_undef},
|
||||
{NULL, TLSEXT_SIGALG_dsa_sha224,
|
||||
NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
|
||||
NID_undef, NID_undef},
|
||||
{NULL, TLSEXT_SIGALG_dsa_sha1,
|
||||
NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
|
||||
NID_dsaWithSHA1, NID_undef},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_GOST
|
||||
{NULL, TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256,
|
||||
NID_id_GostR3411_2012_256, SSL_MD_GOST12_256_IDX,
|
||||
NID_id_GostR3410_2012_256, SSL_PKEY_GOST12_256,
|
||||
NID_undef, NID_undef},
|
||||
{NULL, TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512,
|
||||
NID_id_GostR3411_2012_512, SSL_MD_GOST12_512_IDX,
|
||||
NID_id_GostR3410_2012_512, SSL_PKEY_GOST12_512,
|
||||
NID_undef, NID_undef},
|
||||
{NULL, TLSEXT_SIGALG_gostr34102001_gostr3411,
|
||||
NID_id_GostR3411_94, SSL_MD_GOST94_IDX,
|
||||
NID_id_GostR3410_2001, SSL_PKEY_GOST01,
|
||||
NID_undef, NID_undef}
|
||||
#endif
|
||||
};
|
||||
/* Legacy sigalgs for TLS < 1.2 RSA TLS signatures */
|
||||
static const SIGALG_LOOKUP legacy_rsa_sigalg = {
|
||||
"rsa_pkcs1_md5_sha1", 0,
|
||||
NID_md5_sha1, SSL_MD_MD5_SHA1_IDX,
|
||||
EVP_PKEY_RSA, SSL_PKEY_RSA,
|
||||
NID_undef, NID_undef
|
||||
};
|
||||
|
||||
/*
|
||||
* Default signature algorithm values used if signature algorithms not present.
|
||||
* From RFC5246. Note: order must match certificate index order.
|
||||
*/
|
||||
static const uint16_t tls_default_sigalg[] = {
|
||||
TLSEXT_SIGALG_rsa_pkcs1_sha1, /* SSL_PKEY_RSA */
|
||||
0, /* SSL_PKEY_RSA_PSS_SIGN */
|
||||
TLSEXT_SIGALG_dsa_sha1, /* SSL_PKEY_DSA_SIGN */
|
||||
TLSEXT_SIGALG_ecdsa_sha1, /* SSL_PKEY_ECC */
|
||||
TLSEXT_SIGALG_gostr34102001_gostr3411, /* SSL_PKEY_GOST01 */
|
||||
TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256, /* SSL_PKEY_GOST12_256 */
|
||||
TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512, /* SSL_PKEY_GOST12_512 */
|
||||
0 /* SSL_PKEY_ED25519 */
|
||||
};
|
||||
|
||||
/* Lookup TLS signature algorithm */
|
||||
static const SIGALG_LOOKUP *tls1_lookup_sigalg(uint16_t sigalg)
|
||||
{
|
||||
size_t i;
|
||||
const SIGALG_LOOKUP *s;
|
||||
|
||||
for (i = 0, s = sigalg_lookup_tbl; i < OSSL_NELEM(sigalg_lookup_tbl);
|
||||
i++, s++) {
|
||||
if (s->sigalg == sigalg)
|
||||
return s;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
/* Lookup hash: return 0 if invalid or not enabled */
|
||||
int tls1_lookup_md(const SIGALG_LOOKUP *lu, const EVP_MD **pmd)
|
||||
{
|
||||
const EVP_MD *md;
|
||||
if (lu == NULL)
|
||||
return 0;
|
||||
/* lu->hash == NID_undef means no associated digest */
|
||||
if (lu->hash == NID_undef) {
|
||||
md = NULL;
|
||||
} else {
|
||||
md = ssl_md(lu->hash_idx);
|
||||
if (md == NULL)
|
||||
return 0;
|
||||
}
|
||||
if (pmd)
|
||||
*pmd = md;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if key is large enough to generate RSA-PSS signature.
|
||||
*
|
||||
* The key must greater than or equal to 2 * hash length + 2.
|
||||
* SHA512 has a hash length of 64 bytes, which is incompatible
|
||||
* with a 128 byte (1024 bit) key.
|
||||
*/
|
||||
#define RSA_PSS_MINIMUM_KEY_SIZE(md) (2 * EVP_MD_size(md) + 2)
|
||||
static int rsa_pss_check_min_key_size(const RSA *rsa, const SIGALG_LOOKUP *lu)
|
||||
{
|
||||
const EVP_MD *md;
|
||||
|
||||
if (rsa == NULL)
|
||||
return 0;
|
||||
if (!tls1_lookup_md(lu, &md) || md == NULL)
|
||||
return 0;
|
||||
if (RSA_size(rsa) < RSA_PSS_MINIMUM_KEY_SIZE(md))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Return a signature algorithm for TLS < 1.2 where the signature type
|
||||
* is fixed by the certificate type.
|
||||
*/
|
||||
static const SIGALG_LOOKUP *tls1_get_legacy_sigalg(const SSL *s, int idx)
|
||||
{
|
||||
if (idx == -1) {
|
||||
if (s->server) {
|
||||
size_t i;
|
||||
|
||||
/* Work out index corresponding to ciphersuite */
|
||||
for (i = 0; i < SSL_PKEY_NUM; i++) {
|
||||
const SSL_CERT_LOOKUP *clu = ssl_cert_lookup_by_idx(i);
|
||||
|
||||
if (clu->amask & s->s3->tmp.new_cipher->algorithm_auth) {
|
||||
idx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
idx = s->cert->key - s->cert->pkeys;
|
||||
}
|
||||
}
|
||||
if (idx < 0 || idx >= (int)OSSL_NELEM(tls_default_sigalg))
|
||||
return NULL;
|
||||
if (SSL_USE_SIGALGS(s) || idx != SSL_PKEY_RSA) {
|
||||
const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(tls_default_sigalg[idx]);
|
||||
|
||||
if (!tls1_lookup_md(lu, NULL))
|
||||
return NULL;
|
||||
return lu;
|
||||
}
|
||||
return &legacy_rsa_sigalg;
|
||||
}
|
||||
/* Set peer sigalg based key type */
|
||||
int tls1_set_peer_legacy_sigalg(SSL *s, const EVP_PKEY *pkey)
|
||||
{
|
||||
size_t idx;
|
||||
const SIGALG_LOOKUP *lu;
|
||||
|
||||
if (ssl_cert_lookup_by_pkey(pkey, &idx) == NULL)
|
||||
return 0;
|
||||
lu = tls1_get_legacy_sigalg(s, idx);
|
||||
if (lu == NULL)
|
||||
return 0;
|
||||
s->s3->tmp.peer_sigalg = lu;
|
||||
return 1;
|
||||
}
|
||||
|
||||
size_t tls12_get_psigalgs(SSL *s, int sent, const uint16_t **psigs)
|
||||
{
|
||||
/*
|
||||
* If Suite B mode use Suite B sigalgs only, ignore any other
|
||||
@@ -721,19 +879,23 @@ size_t tls12_get_psigalgs(SSL *s, int sent, const unsigned char **psigs)
|
||||
switch (tls1_suiteb(s)) {
|
||||
case SSL_CERT_FLAG_SUITEB_128_LOS:
|
||||
*psigs = suiteb_sigalgs;
|
||||
return sizeof(suiteb_sigalgs);
|
||||
return OSSL_NELEM(suiteb_sigalgs);
|
||||
|
||||
case SSL_CERT_FLAG_SUITEB_128_LOS_ONLY:
|
||||
*psigs = suiteb_sigalgs;
|
||||
return 2;
|
||||
return 1;
|
||||
|
||||
case SSL_CERT_FLAG_SUITEB_192_LOS:
|
||||
*psigs = suiteb_sigalgs + 2;
|
||||
return 2;
|
||||
*psigs = suiteb_sigalgs + 1;
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
/* If server use client authentication sigalgs if not NULL */
|
||||
if (s->server == sent && s->cert->client_sigalgs) {
|
||||
/*
|
||||
* We use client_sigalgs (if not NULL) if we're a server
|
||||
* and sending a certificate request or if we're a client and
|
||||
* determining which shared algorithm to use.
|
||||
*/
|
||||
if ((s->server == sent) && s->cert->client_sigalgs != NULL) {
|
||||
*psigs = s->cert->client_sigalgs;
|
||||
return s->cert->client_sigalgslen;
|
||||
} else if (s->cert->conf_sigalgs) {
|
||||
@@ -741,89 +903,141 @@ size_t tls12_get_psigalgs(SSL *s, int sent, const unsigned char **psigs)
|
||||
return s->cert->conf_sigalgslen;
|
||||
} else {
|
||||
*psigs = tls12_sigalgs;
|
||||
return sizeof(tls12_sigalgs);
|
||||
return OSSL_NELEM(tls12_sigalgs);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Check signature algorithm is consistent with sent supported signature
|
||||
* algorithms and if so return relevant digest.
|
||||
* algorithms and if so set relevant digest and signature scheme in
|
||||
* s.
|
||||
*/
|
||||
int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s,
|
||||
const unsigned char *sig, EVP_PKEY *pkey)
|
||||
int tls12_check_peer_sigalg(SSL *s, uint16_t sig, EVP_PKEY *pkey)
|
||||
{
|
||||
const unsigned char *sent_sigs;
|
||||
const uint16_t *sent_sigs;
|
||||
const EVP_MD *md = NULL;
|
||||
char sigalgstr[2];
|
||||
size_t sent_sigslen, i;
|
||||
int sigalg = tls12_get_sigid(pkey);
|
||||
int pkeyid = EVP_PKEY_id(pkey);
|
||||
const SIGALG_LOOKUP *lu;
|
||||
|
||||
/* Should never happen */
|
||||
if (sigalg == -1)
|
||||
if (pkeyid == -1)
|
||||
return -1;
|
||||
/* Check key type is consistent with signature */
|
||||
if (sigalg != (int)sig[1]) {
|
||||
SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
if (SSL_IS_TLS13(s)) {
|
||||
/* Disallow DSA for TLS 1.3 */
|
||||
if (pkeyid == EVP_PKEY_DSA) {
|
||||
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
return 0;
|
||||
}
|
||||
/* Only allow PSS for TLS 1.3 */
|
||||
if (pkeyid == EVP_PKEY_RSA)
|
||||
pkeyid = EVP_PKEY_RSA_PSS;
|
||||
}
|
||||
lu = tls1_lookup_sigalg(sig);
|
||||
/*
|
||||
* Check sigalgs is known. Disallow SHA1/SHA224 with TLS 1.3. Check key type
|
||||
* is consistent with signature: RSA keys can be used for RSA-PSS
|
||||
*/
|
||||
if (lu == NULL
|
||||
|| (SSL_IS_TLS13(s) && (lu->hash == NID_sha1 || lu->hash == NID_sha224))
|
||||
|| (pkeyid != lu->sig
|
||||
&& (lu->sig != EVP_PKEY_RSA_PSS || pkeyid != EVP_PKEY_RSA))) {
|
||||
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
return 0;
|
||||
}
|
||||
#ifndef OPENSSL_NO_EC
|
||||
if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) {
|
||||
unsigned char curve_id[2], comp_id;
|
||||
/* Check compression and curve matches extensions */
|
||||
if (!tls1_set_ec_id(curve_id, &comp_id, EVP_PKEY_get0_EC_KEY(pkey)))
|
||||
return 0;
|
||||
if (!s->server && !tls1_check_ec_key(s, curve_id, &comp_id)) {
|
||||
SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_WRONG_CURVE);
|
||||
if (pkeyid == EVP_PKEY_EC) {
|
||||
|
||||
/* Check point compression is permitted */
|
||||
if (!tls1_check_pkey_comp(s, pkey)) {
|
||||
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
|
||||
SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_ILLEGAL_POINT_COMPRESSION);
|
||||
return 0;
|
||||
}
|
||||
/* If Suite B only P-384+SHA384 or P-256+SHA-256 allowed */
|
||||
if (tls1_suiteb(s)) {
|
||||
if (curve_id[0])
|
||||
return 0;
|
||||
if (curve_id[1] == TLSEXT_curve_P_256) {
|
||||
if (sig[0] != TLSEXT_hash_sha256) {
|
||||
SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_ILLEGAL_SUITEB_DIGEST);
|
||||
return 0;
|
||||
}
|
||||
} else if (curve_id[1] == TLSEXT_curve_P_384) {
|
||||
if (sig[0] != TLSEXT_hash_sha384) {
|
||||
SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_ILLEGAL_SUITEB_DIGEST);
|
||||
return 0;
|
||||
}
|
||||
} else
|
||||
|
||||
/* For TLS 1.3 or Suite B check curve matches signature algorithm */
|
||||
if (SSL_IS_TLS13(s) || tls1_suiteb(s)) {
|
||||
EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
|
||||
int curve = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
|
||||
|
||||
if (lu->curve != NID_undef && curve != lu->curve) {
|
||||
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
|
||||
SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_WRONG_CURVE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
} else if (tls1_suiteb(s))
|
||||
if (!SSL_IS_TLS13(s)) {
|
||||
/* Check curve matches extensions */
|
||||
if (!tls1_check_group_id(s, tls1_get_group_id(pkey))) {
|
||||
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
|
||||
SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_WRONG_CURVE);
|
||||
return 0;
|
||||
}
|
||||
if (tls1_suiteb(s)) {
|
||||
/* Check sigalg matches a permissible Suite B value */
|
||||
if (sig != TLSEXT_SIGALG_ecdsa_secp256r1_sha256
|
||||
&& sig != TLSEXT_SIGALG_ecdsa_secp384r1_sha384) {
|
||||
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
|
||||
SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (tls1_suiteb(s)) {
|
||||
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Check signature matches a type we sent */
|
||||
sent_sigslen = tls12_get_psigalgs(s, 1, &sent_sigs);
|
||||
for (i = 0; i < sent_sigslen; i += 2, sent_sigs += 2) {
|
||||
if (sig[0] == sent_sigs[0] && sig[1] == sent_sigs[1])
|
||||
for (i = 0; i < sent_sigslen; i++, sent_sigs++) {
|
||||
if (sig == *sent_sigs)
|
||||
break;
|
||||
}
|
||||
/* Allow fallback to SHA1 if not strict mode */
|
||||
if (i == sent_sigslen
|
||||
&& (sig[0] != TLSEXT_hash_sha1
|
||||
|| s->cert->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT)) {
|
||||
SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
if (i == sent_sigslen && (lu->hash != NID_sha1
|
||||
|| s->cert->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT)) {
|
||||
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
return 0;
|
||||
}
|
||||
*pmd = tls12_get_hash(sig[0]);
|
||||
if (*pmd == NULL) {
|
||||
SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_UNKNOWN_DIGEST);
|
||||
if (!tls1_lookup_md(lu, &md)) {
|
||||
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_UNKNOWN_DIGEST);
|
||||
return 0;
|
||||
}
|
||||
/* Make sure security callback allows algorithm */
|
||||
if (!ssl_security(s, SSL_SECOP_SIGALG_CHECK,
|
||||
EVP_MD_size(*pmd) * 4, EVP_MD_type(*pmd), (void *)sig)) {
|
||||
SSLerr(SSL_F_TLS12_CHECK_PEER_SIGALG, SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
return 0;
|
||||
if (md != NULL) {
|
||||
/*
|
||||
* Make sure security callback allows algorithm. For historical
|
||||
* reasons we have to pass the sigalg as a two byte char array.
|
||||
*/
|
||||
sigalgstr[0] = (sig >> 8) & 0xff;
|
||||
sigalgstr[1] = sig & 0xff;
|
||||
if (!ssl_security(s, SSL_SECOP_SIGALG_CHECK,
|
||||
EVP_MD_size(md) * 4, EVP_MD_type(md),
|
||||
(void *)sigalgstr)) {
|
||||
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_TLS12_CHECK_PEER_SIGALG,
|
||||
SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Store the digest used so applications can retrieve it if they wish.
|
||||
*/
|
||||
s->s3->tmp.peer_md = *pmd;
|
||||
/* Store the sigalg the peer uses */
|
||||
s->s3->tmp.peer_sigalg = lu;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int SSL_get_peer_signature_type_nid(const SSL *s, int *pnid)
|
||||
{
|
||||
if (s->s3->tmp.peer_sigalg == NULL)
|
||||
return 0;
|
||||
*pnid = s->s3->tmp.peer_sigalg->sig;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -837,12 +1051,14 @@ int tls12_check_peer_sigalg(const EVP_MD **pmd, SSL *s,
|
||||
*
|
||||
* Call ssl_cipher_disabled() to check that it's enabled or not.
|
||||
*/
|
||||
void ssl_set_client_disabled(SSL *s)
|
||||
int ssl_set_client_disabled(SSL *s)
|
||||
{
|
||||
s->s3->tmp.mask_a = 0;
|
||||
s->s3->tmp.mask_k = 0;
|
||||
ssl_set_sig_mask(&s->s3->tmp.mask_a, s, SSL_SECOP_SIGALG_MASK);
|
||||
ssl_get_client_min_max_version(s, &s->s3->tmp.min_ver, &s->s3->tmp.max_ver);
|
||||
if (ssl_get_min_max_version(s, &s->s3->tmp.min_ver,
|
||||
&s->s3->tmp.max_ver) != 0)
|
||||
return 0;
|
||||
#ifndef OPENSSL_NO_PSK
|
||||
/* with PSK there must be client callback set */
|
||||
if (!s->psk_client_callback) {
|
||||
@@ -856,6 +1072,7 @@ void ssl_set_client_disabled(SSL *s)
|
||||
s->s3->tmp.mask_k |= SSL_kSRP;
|
||||
}
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -895,2066 +1112,74 @@ int ssl_cipher_disabled(SSL *s, const SSL_CIPHER *c, int op, int ecdhe)
|
||||
return !ssl_security(s, op, c->strength_bits, 0, (void *)c);
|
||||
}
|
||||
|
||||
static int tls_use_ticket(SSL *s)
|
||||
int tls_use_ticket(SSL *s)
|
||||
{
|
||||
if (s->options & SSL_OP_NO_TICKET)
|
||||
if ((s->options & SSL_OP_NO_TICKET))
|
||||
return 0;
|
||||
return ssl_security(s, SSL_SECOP_TICKET, 0, 0, NULL);
|
||||
}
|
||||
|
||||
static int compare_uint(const void *p1, const void *p2)
|
||||
{
|
||||
unsigned int u1 = *((const unsigned int *)p1);
|
||||
unsigned int u2 = *((const unsigned int *)p2);
|
||||
if (u1 < u2)
|
||||
return -1;
|
||||
else if (u1 > u2)
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Per http://tools.ietf.org/html/rfc5246#section-7.4.1.4, there may not be
|
||||
* more than one extension of the same type in a ClientHello or ServerHello.
|
||||
* This function does an initial scan over the extensions block to filter those
|
||||
* out. It returns 1 if all extensions are unique, and 0 if the extensions
|
||||
* contain duplicates, could not be successfully parsed, or an internal error
|
||||
* occurred.
|
||||
*/
|
||||
static int tls1_check_duplicate_extensions(const PACKET *packet)
|
||||
{
|
||||
PACKET extensions = *packet;
|
||||
size_t num_extensions = 0, i = 0;
|
||||
unsigned int *extension_types = NULL;
|
||||
int ret = 0;
|
||||
|
||||
/* First pass: count the extensions. */
|
||||
while (PACKET_remaining(&extensions) > 0) {
|
||||
unsigned int type;
|
||||
PACKET extension;
|
||||
if (!PACKET_get_net_2(&extensions, &type) ||
|
||||
!PACKET_get_length_prefixed_2(&extensions, &extension)) {
|
||||
goto done;
|
||||
}
|
||||
num_extensions++;
|
||||
}
|
||||
|
||||
if (num_extensions <= 1)
|
||||
return 1;
|
||||
|
||||
extension_types = OPENSSL_malloc(sizeof(unsigned int) * num_extensions);
|
||||
if (extension_types == NULL) {
|
||||
SSLerr(SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS, ERR_R_MALLOC_FAILURE);
|
||||
goto done;
|
||||
}
|
||||
|
||||
/* Second pass: gather the extension types. */
|
||||
extensions = *packet;
|
||||
for (i = 0; i < num_extensions; i++) {
|
||||
PACKET extension;
|
||||
if (!PACKET_get_net_2(&extensions, &extension_types[i]) ||
|
||||
!PACKET_get_length_prefixed_2(&extensions, &extension)) {
|
||||
/* This should not happen. */
|
||||
SSLerr(SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS, ERR_R_INTERNAL_ERROR);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
if (PACKET_remaining(&extensions) != 0) {
|
||||
SSLerr(SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS, ERR_R_INTERNAL_ERROR);
|
||||
goto done;
|
||||
}
|
||||
/* Sort the extensions and make sure there are no duplicates. */
|
||||
qsort(extension_types, num_extensions, sizeof(unsigned int), compare_uint);
|
||||
for (i = 1; i < num_extensions; i++) {
|
||||
if (extension_types[i - 1] == extension_types[i])
|
||||
goto done;
|
||||
}
|
||||
ret = 1;
|
||||
done:
|
||||
OPENSSL_free(extension_types);
|
||||
return ret;
|
||||
}
|
||||
|
||||
unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
|
||||
unsigned char *limit, int *al)
|
||||
{
|
||||
int extdatalen = 0;
|
||||
unsigned char *orig = buf;
|
||||
unsigned char *ret = buf;
|
||||
#ifndef OPENSSL_NO_EC
|
||||
/* See if we support any ECC ciphersuites */
|
||||
int using_ecc = 0;
|
||||
if (s->version >= TLS1_VERSION || SSL_IS_DTLS(s)) {
|
||||
int i;
|
||||
unsigned long alg_k, alg_a;
|
||||
STACK_OF(SSL_CIPHER) *cipher_stack = SSL_get_ciphers(s);
|
||||
|
||||
for (i = 0; i < sk_SSL_CIPHER_num(cipher_stack); i++) {
|
||||
const SSL_CIPHER *c = sk_SSL_CIPHER_value(cipher_stack, i);
|
||||
|
||||
alg_k = c->algorithm_mkey;
|
||||
alg_a = c->algorithm_auth;
|
||||
if ((alg_k & (SSL_kECDHE | SSL_kECDHEPSK))
|
||||
|| (alg_a & SSL_aECDSA)) {
|
||||
using_ecc = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
ret += 2;
|
||||
|
||||
if (ret >= limit)
|
||||
return NULL; /* this really never occurs, but ... */
|
||||
|
||||
/* Add RI if renegotiating */
|
||||
if (s->renegotiate) {
|
||||
int el;
|
||||
|
||||
if (!ssl_add_clienthello_renegotiate_ext(s, 0, &el, 0)) {
|
||||
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (CHECKLEN(ret, 4 + el, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_renegotiate, ret);
|
||||
s2n(el, ret);
|
||||
|
||||
if (!ssl_add_clienthello_renegotiate_ext(s, ret, &el, el)) {
|
||||
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret += el;
|
||||
}
|
||||
/* Only add RI for SSLv3 */
|
||||
if (s->client_version == SSL3_VERSION)
|
||||
goto done;
|
||||
|
||||
if (s->tlsext_hostname != NULL) {
|
||||
/* Add TLS extension servername to the Client Hello message */
|
||||
size_t size_str;
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 for the servername type and extension length
|
||||
* 2 for servernamelist length
|
||||
* 1 for the hostname type
|
||||
* 2 for hostname length
|
||||
* + hostname length
|
||||
*/
|
||||
size_str = strlen(s->tlsext_hostname);
|
||||
if (CHECKLEN(ret, 9 + size_str, limit))
|
||||
return NULL;
|
||||
|
||||
/* extension type and length */
|
||||
s2n(TLSEXT_TYPE_server_name, ret);
|
||||
s2n(size_str + 5, ret);
|
||||
|
||||
/* length of servername list */
|
||||
s2n(size_str + 3, ret);
|
||||
|
||||
/* hostname type, length and hostname */
|
||||
*(ret++) = (unsigned char)TLSEXT_NAMETYPE_host_name;
|
||||
s2n(size_str, ret);
|
||||
memcpy(ret, s->tlsext_hostname, size_str);
|
||||
ret += size_str;
|
||||
}
|
||||
#ifndef OPENSSL_NO_SRP
|
||||
/* Add SRP username if there is one */
|
||||
if (s->srp_ctx.login != NULL) { /* Add TLS extension SRP username to the
|
||||
* Client Hello message */
|
||||
|
||||
size_t login_len = strlen(s->srp_ctx.login);
|
||||
if (login_len > 255 || login_len == 0) {
|
||||
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 for the srp type type and extension length
|
||||
* 1 for the srp user identity
|
||||
* + srp user identity length
|
||||
*/
|
||||
if (CHECKLEN(ret, 5 + login_len, limit))
|
||||
return NULL;
|
||||
|
||||
/* fill in the extension */
|
||||
s2n(TLSEXT_TYPE_srp, ret);
|
||||
s2n(login_len + 1, ret);
|
||||
(*ret++) = (unsigned char)login_len;
|
||||
memcpy(ret, s->srp_ctx.login, login_len);
|
||||
ret += login_len;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
if (using_ecc) {
|
||||
/*
|
||||
* Add TLS extension ECPointFormats to the ClientHello message
|
||||
*/
|
||||
const unsigned char *pcurves, *pformats;
|
||||
size_t num_curves, num_formats, curves_list_len;
|
||||
size_t i;
|
||||
unsigned char *etmp;
|
||||
|
||||
tls1_get_formatlist(s, &pformats, &num_formats);
|
||||
|
||||
if (num_formats > 255) {
|
||||
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the ec point formats type and extension length
|
||||
* 1 byte for the length of the formats
|
||||
* + formats length
|
||||
*/
|
||||
if (CHECKLEN(ret, 5 + num_formats, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_ec_point_formats, ret);
|
||||
/* The point format list has 1-byte length. */
|
||||
s2n(num_formats + 1, ret);
|
||||
*(ret++) = (unsigned char)num_formats;
|
||||
memcpy(ret, pformats, num_formats);
|
||||
ret += num_formats;
|
||||
|
||||
/*
|
||||
* Add TLS extension EllipticCurves to the ClientHello message
|
||||
*/
|
||||
pcurves = s->tlsext_ellipticcurvelist;
|
||||
if (!tls1_get_curvelist(s, 0, &pcurves, &num_curves))
|
||||
return NULL;
|
||||
|
||||
if (num_curves > 65532 / 2) {
|
||||
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the ec curves type and extension length
|
||||
* 2 bytes for the curve list length
|
||||
* + curve list length
|
||||
*/
|
||||
if (CHECKLEN(ret, 6 + (num_curves * 2), limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_elliptic_curves, ret);
|
||||
etmp = ret + 4;
|
||||
/* Copy curve ID if supported */
|
||||
for (i = 0; i < num_curves; i++, pcurves += 2) {
|
||||
if (tls_curve_allowed(s, pcurves, SSL_SECOP_CURVE_SUPPORTED)) {
|
||||
*etmp++ = pcurves[0];
|
||||
*etmp++ = pcurves[1];
|
||||
}
|
||||
}
|
||||
|
||||
curves_list_len = etmp - ret - 4;
|
||||
|
||||
s2n(curves_list_len + 2, ret);
|
||||
s2n(curves_list_len, ret);
|
||||
ret += curves_list_len;
|
||||
}
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
|
||||
if (tls_use_ticket(s)) {
|
||||
size_t ticklen;
|
||||
if (!s->new_session && s->session && s->session->tlsext_tick)
|
||||
ticklen = s->session->tlsext_ticklen;
|
||||
else if (s->session && s->tlsext_session_ticket &&
|
||||
s->tlsext_session_ticket->data) {
|
||||
ticklen = s->tlsext_session_ticket->length;
|
||||
s->session->tlsext_tick = OPENSSL_malloc(ticklen);
|
||||
if (s->session->tlsext_tick == NULL)
|
||||
return NULL;
|
||||
memcpy(s->session->tlsext_tick,
|
||||
s->tlsext_session_ticket->data, ticklen);
|
||||
s->session->tlsext_ticklen = ticklen;
|
||||
} else
|
||||
ticklen = 0;
|
||||
if (ticklen == 0 && s->tlsext_session_ticket &&
|
||||
s->tlsext_session_ticket->data == NULL)
|
||||
goto skip_ext;
|
||||
/*
|
||||
* Check for enough room 2 for extension type, 2 for len rest for
|
||||
* ticket
|
||||
*/
|
||||
if (CHECKLEN(ret, 4 + ticklen, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_session_ticket, ret);
|
||||
s2n(ticklen, ret);
|
||||
if (ticklen > 0) {
|
||||
memcpy(ret, s->session->tlsext_tick, ticklen);
|
||||
ret += ticklen;
|
||||
}
|
||||
}
|
||||
skip_ext:
|
||||
|
||||
#ifndef OPENSSL_NO_OCSP
|
||||
if (s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp) {
|
||||
int i;
|
||||
size_t extlen, idlen;
|
||||
int lentmp;
|
||||
OCSP_RESPID *id;
|
||||
|
||||
idlen = 0;
|
||||
for (i = 0; i < sk_OCSP_RESPID_num(s->tlsext_ocsp_ids); i++) {
|
||||
id = sk_OCSP_RESPID_value(s->tlsext_ocsp_ids, i);
|
||||
lentmp = i2d_OCSP_RESPID(id, NULL);
|
||||
if (lentmp <= 0)
|
||||
return NULL;
|
||||
idlen += (size_t)lentmp + 2;
|
||||
}
|
||||
|
||||
if (s->tlsext_ocsp_exts) {
|
||||
lentmp = i2d_X509_EXTENSIONS(s->tlsext_ocsp_exts, NULL);
|
||||
if (lentmp < 0)
|
||||
return NULL;
|
||||
extlen = (size_t)lentmp;
|
||||
} else
|
||||
extlen = 0;
|
||||
|
||||
if (extlen + idlen > 0xFFF0)
|
||||
return NULL;
|
||||
/*
|
||||
* 2 bytes for status request type
|
||||
* 2 bytes for status request len
|
||||
* 1 byte for OCSP request type
|
||||
* 2 bytes for length of ids
|
||||
* 2 bytes for length of extensions
|
||||
* + length of ids
|
||||
* + length of extensions
|
||||
*/
|
||||
if (CHECKLEN(ret, 9 + idlen + extlen, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_status_request, ret);
|
||||
s2n(extlen + idlen + 5, ret);
|
||||
*(ret++) = TLSEXT_STATUSTYPE_ocsp;
|
||||
s2n(idlen, ret);
|
||||
for (i = 0; i < sk_OCSP_RESPID_num(s->tlsext_ocsp_ids); i++) {
|
||||
/* save position of id len */
|
||||
unsigned char *q = ret;
|
||||
id = sk_OCSP_RESPID_value(s->tlsext_ocsp_ids, i);
|
||||
/* skip over id len */
|
||||
ret += 2;
|
||||
lentmp = i2d_OCSP_RESPID(id, &ret);
|
||||
/* write id len */
|
||||
s2n(lentmp, q);
|
||||
}
|
||||
s2n(extlen, ret);
|
||||
if (extlen > 0)
|
||||
i2d_X509_EXTENSIONS(s->tlsext_ocsp_exts, &ret);
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_HEARTBEATS
|
||||
if (SSL_IS_DTLS(s)) {
|
||||
/* Add Heartbeat extension */
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the heartbeat ext type and extension length
|
||||
* 1 byte for the mode
|
||||
*/
|
||||
if (CHECKLEN(ret, 5, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_heartbeat, ret);
|
||||
s2n(1, ret);
|
||||
/*-
|
||||
* Set mode:
|
||||
* 1: peer may send requests
|
||||
* 2: peer not allowed to send requests
|
||||
*/
|
||||
if (s->tlsext_heartbeat & SSL_DTLSEXT_HB_DONT_RECV_REQUESTS)
|
||||
*(ret++) = SSL_DTLSEXT_HB_DONT_SEND_REQUESTS;
|
||||
else
|
||||
*(ret++) = SSL_DTLSEXT_HB_ENABLED;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
if (s->ctx->next_proto_select_cb && !s->s3->tmp.finish_md_len) {
|
||||
/*
|
||||
* The client advertises an empty extension to indicate its support
|
||||
* for Next Protocol Negotiation
|
||||
*/
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the NPN ext type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_next_proto_neg, ret);
|
||||
s2n(0, ret);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* finish_md_len is non-zero during a renegotiation, so
|
||||
* this avoids sending ALPN during the renegotiation
|
||||
* (see longer comment below)
|
||||
*/
|
||||
if (s->alpn_client_proto_list && !s->s3->tmp.finish_md_len) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the ALPN type and extension length
|
||||
* 2 bytes for the ALPN protocol list length
|
||||
* + ALPN protocol list length
|
||||
*/
|
||||
if (CHECKLEN(ret, 6 + s->alpn_client_proto_list_len, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_application_layer_protocol_negotiation, ret);
|
||||
s2n(2 + s->alpn_client_proto_list_len, ret);
|
||||
s2n(s->alpn_client_proto_list_len, ret);
|
||||
memcpy(ret, s->alpn_client_proto_list, s->alpn_client_proto_list_len);
|
||||
ret += s->alpn_client_proto_list_len;
|
||||
s->s3->alpn_sent = 1;
|
||||
}
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
if (SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s)) {
|
||||
int el;
|
||||
|
||||
/* Returns 0 on success!! */
|
||||
if (ssl_add_clienthello_use_srtp_ext(s, 0, &el, 0)) {
|
||||
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the SRTP type and extension length
|
||||
* + SRTP profiles length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4 + el, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_use_srtp, ret);
|
||||
s2n(el, ret);
|
||||
|
||||
if (ssl_add_clienthello_use_srtp_ext(s, ret, &el, el)) {
|
||||
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
ret += el;
|
||||
}
|
||||
#endif
|
||||
custom_ext_init(&s->cert->cli_ext);
|
||||
/* Add custom TLS Extensions to ClientHello */
|
||||
if (!custom_ext_add(s, 0, &ret, limit, al))
|
||||
return NULL;
|
||||
/*
|
||||
* In 1.1.0 before 1.1.0c we negotiated EtM with DTLS, then just
|
||||
* silently failed to actually do it. It is fixed in 1.1.1 but to
|
||||
* ease the transition especially from 1.1.0b to 1.1.0c, we just
|
||||
* disable it in 1.1.0.
|
||||
* Also skip if SSL_OP_NO_ENCRYPT_THEN_MAC is set.
|
||||
*/
|
||||
if (!SSL_IS_DTLS(s) && !(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC)) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the ETM type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_encrypt_then_mac, ret);
|
||||
s2n(0, ret);
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_CT
|
||||
if (s->ct_validation_callback != NULL) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the SCT type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_signed_certificate_timestamp, ret);
|
||||
s2n(0, ret);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the EMS type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_extended_master_secret, ret);
|
||||
s2n(0, ret);
|
||||
|
||||
/*
|
||||
* WebSphere application server can not handle having the
|
||||
* last extension be 0-length (e.g. EMS, EtM), so keep those
|
||||
* before SigAlgs
|
||||
*/
|
||||
if (SSL_CLIENT_USE_SIGALGS(s)) {
|
||||
size_t salglen;
|
||||
const unsigned char *salg;
|
||||
unsigned char *etmp;
|
||||
salglen = tls12_get_psigalgs(s, 1, &salg);
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the sigalgs type and extension length
|
||||
* 2 bytes for the sigalg list length
|
||||
* + sigalg list length
|
||||
*/
|
||||
if (CHECKLEN(ret, salglen + 6, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_signature_algorithms, ret);
|
||||
etmp = ret;
|
||||
/* Skip over lengths for now */
|
||||
ret += 4;
|
||||
salglen = tls12_copy_sigalgs(s, ret, salg, salglen);
|
||||
/* Fill in lengths */
|
||||
s2n(salglen + 2, etmp);
|
||||
s2n(salglen, etmp);
|
||||
ret += salglen;
|
||||
}
|
||||
|
||||
/*
|
||||
* Add padding to workaround bugs in F5 terminators. See
|
||||
* https://tools.ietf.org/html/draft-agl-tls-padding-03 NB: because this
|
||||
* code works out the length of all existing extensions it MUST always
|
||||
* appear last. WebSphere 7.x/8.x is intolerant of empty extensions
|
||||
* being last, so minimum length of 1.
|
||||
*/
|
||||
if (s->options & SSL_OP_TLSEXT_PADDING) {
|
||||
int hlen = ret - (unsigned char *)s->init_buf->data;
|
||||
|
||||
if (hlen > 0xff && hlen < 0x200) {
|
||||
hlen = 0x200 - hlen;
|
||||
if (hlen >= 4)
|
||||
hlen -= 4;
|
||||
else
|
||||
hlen = 1;
|
||||
|
||||
/*-
|
||||
* check for enough space. Strictly speaking we know we've already
|
||||
* got enough space because to get here the message size is < 0x200,
|
||||
* but we know that we've allocated far more than that in the buffer
|
||||
* - but for consistency and robustness we're going to check anyway.
|
||||
*
|
||||
* 4 bytes for the padding type and extension length
|
||||
* + padding length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4 + hlen, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_padding, ret);
|
||||
s2n(hlen, ret);
|
||||
memset(ret, 0, hlen);
|
||||
ret += hlen;
|
||||
}
|
||||
}
|
||||
|
||||
done:
|
||||
|
||||
if ((extdatalen = ret - orig - 2) == 0)
|
||||
return orig;
|
||||
|
||||
s2n(extdatalen, orig);
|
||||
return ret;
|
||||
}
|
||||
|
||||
unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
|
||||
unsigned char *limit, int *al)
|
||||
{
|
||||
int extdatalen = 0;
|
||||
unsigned char *orig = buf;
|
||||
unsigned char *ret = buf;
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
int next_proto_neg_seen;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
unsigned long alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
|
||||
unsigned long alg_a = s->s3->tmp.new_cipher->algorithm_auth;
|
||||
int using_ecc = (alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA);
|
||||
using_ecc = using_ecc && (s->session->tlsext_ecpointformatlist != NULL);
|
||||
#endif
|
||||
|
||||
ret += 2;
|
||||
if (ret >= limit)
|
||||
return NULL; /* this really never occurs, but ... */
|
||||
|
||||
if (s->s3->send_connection_binding) {
|
||||
int el;
|
||||
|
||||
/* Still add this even if SSL_OP_NO_RENEGOTIATION is set */
|
||||
if (!ssl_add_serverhello_renegotiate_ext(s, 0, &el, 0)) {
|
||||
SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the reneg type and extension length
|
||||
* + reneg data length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4 + el, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_renegotiate, ret);
|
||||
s2n(el, ret);
|
||||
|
||||
if (!ssl_add_serverhello_renegotiate_ext(s, ret, &el, el)) {
|
||||
SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret += el;
|
||||
}
|
||||
|
||||
/* Only add RI for SSLv3 */
|
||||
if (s->version == SSL3_VERSION)
|
||||
goto done;
|
||||
|
||||
if (!s->hit && s->servername_done == 1
|
||||
&& s->session->tlsext_hostname != NULL) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the server name type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_server_name, ret);
|
||||
s2n(0, ret);
|
||||
}
|
||||
#ifndef OPENSSL_NO_EC
|
||||
if (using_ecc) {
|
||||
const unsigned char *plist;
|
||||
size_t plistlen;
|
||||
/*
|
||||
* Add TLS extension ECPointFormats to the ServerHello message
|
||||
*/
|
||||
|
||||
tls1_get_formatlist(s, &plist, &plistlen);
|
||||
|
||||
if (plistlen > 255) {
|
||||
SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the ec points format type and extension length
|
||||
* 1 byte for the points format list length
|
||||
* + length of points format list
|
||||
*/
|
||||
if (CHECKLEN(ret, 5 + plistlen, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_ec_point_formats, ret);
|
||||
s2n(plistlen + 1, ret);
|
||||
*(ret++) = (unsigned char)plistlen;
|
||||
memcpy(ret, plist, plistlen);
|
||||
ret += plistlen;
|
||||
|
||||
}
|
||||
/*
|
||||
* Currently the server should not respond with a SupportedCurves
|
||||
* extension
|
||||
*/
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
|
||||
if (s->tlsext_ticket_expected && tls_use_ticket(s)) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the Ticket type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_session_ticket, ret);
|
||||
s2n(0, ret);
|
||||
} else {
|
||||
/*
|
||||
* if we don't add the above TLSEXT, we can't add a session ticket
|
||||
* later
|
||||
*/
|
||||
s->tlsext_ticket_expected = 0;
|
||||
}
|
||||
|
||||
if (s->tlsext_status_expected) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the Status request type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_status_request, ret);
|
||||
s2n(0, ret);
|
||||
}
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
if (SSL_IS_DTLS(s) && s->srtp_profile) {
|
||||
int el;
|
||||
|
||||
/* Returns 0 on success!! */
|
||||
if (ssl_add_serverhello_use_srtp_ext(s, 0, &el, 0)) {
|
||||
SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the SRTP profiles type and extension length
|
||||
* + length of the SRTP profiles list
|
||||
*/
|
||||
if (CHECKLEN(ret, 4 + el, limit))
|
||||
return NULL;
|
||||
|
||||
s2n(TLSEXT_TYPE_use_srtp, ret);
|
||||
s2n(el, ret);
|
||||
|
||||
if (ssl_add_serverhello_use_srtp_ext(s, ret, &el, el)) {
|
||||
SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
|
||||
return NULL;
|
||||
}
|
||||
ret += el;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (((s->s3->tmp.new_cipher->id & 0xFFFF) == 0x80
|
||||
|| (s->s3->tmp.new_cipher->id & 0xFFFF) == 0x81)
|
||||
&& (SSL_get_options(s) & SSL_OP_CRYPTOPRO_TLSEXT_BUG)) {
|
||||
const unsigned char cryptopro_ext[36] = {
|
||||
0xfd, 0xe8, /* 65000 */
|
||||
0x00, 0x20, /* 32 bytes length */
|
||||
0x30, 0x1e, 0x30, 0x08, 0x06, 0x06, 0x2a, 0x85,
|
||||
0x03, 0x02, 0x02, 0x09, 0x30, 0x08, 0x06, 0x06,
|
||||
0x2a, 0x85, 0x03, 0x02, 0x02, 0x16, 0x30, 0x08,
|
||||
0x06, 0x06, 0x2a, 0x85, 0x03, 0x02, 0x02, 0x17
|
||||
};
|
||||
|
||||
/* check for enough space. */
|
||||
if (CHECKLEN(ret, sizeof(cryptopro_ext), limit))
|
||||
return NULL;
|
||||
memcpy(ret, cryptopro_ext, sizeof(cryptopro_ext));
|
||||
ret += sizeof(cryptopro_ext);
|
||||
|
||||
}
|
||||
#ifndef OPENSSL_NO_HEARTBEATS
|
||||
/* Add Heartbeat extension if we've received one */
|
||||
if (SSL_IS_DTLS(s) && (s->tlsext_heartbeat & SSL_DTLSEXT_HB_ENABLED)) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the Heartbeat type and extension length
|
||||
* 1 byte for the mode
|
||||
*/
|
||||
if (CHECKLEN(ret, 5, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_heartbeat, ret);
|
||||
s2n(1, ret);
|
||||
/*-
|
||||
* Set mode:
|
||||
* 1: peer may send requests
|
||||
* 2: peer not allowed to send requests
|
||||
*/
|
||||
if (s->tlsext_heartbeat & SSL_DTLSEXT_HB_DONT_RECV_REQUESTS)
|
||||
*(ret++) = SSL_DTLSEXT_HB_DONT_SEND_REQUESTS;
|
||||
else
|
||||
*(ret++) = SSL_DTLSEXT_HB_ENABLED;
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
next_proto_neg_seen = s->s3->next_proto_neg_seen;
|
||||
s->s3->next_proto_neg_seen = 0;
|
||||
if (next_proto_neg_seen && s->ctx->next_protos_advertised_cb) {
|
||||
const unsigned char *npa;
|
||||
unsigned int npalen;
|
||||
int r;
|
||||
|
||||
r = s->ctx->next_protos_advertised_cb(s, &npa, &npalen,
|
||||
s->
|
||||
ctx->next_protos_advertised_cb_arg);
|
||||
if (r == SSL_TLSEXT_ERR_OK) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the NPN type and extension length
|
||||
* + length of protocols list
|
||||
*/
|
||||
if (CHECKLEN(ret, 4 + npalen, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_next_proto_neg, ret);
|
||||
s2n(npalen, ret);
|
||||
memcpy(ret, npa, npalen);
|
||||
ret += npalen;
|
||||
s->s3->next_proto_neg_seen = 1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (!custom_ext_add(s, 1, &ret, limit, al))
|
||||
return NULL;
|
||||
if (s->tlsext_use_etm) {
|
||||
/*
|
||||
* Don't use encrypt_then_mac if AEAD or RC4 might want to disable
|
||||
* for other cases too.
|
||||
*/
|
||||
if (SSL_IS_DTLS(s) || s->s3->tmp.new_cipher->algorithm_mac == SSL_AEAD
|
||||
|| s->s3->tmp.new_cipher->algorithm_enc == SSL_RC4
|
||||
|| s->s3->tmp.new_cipher->algorithm_enc == SSL_eGOST2814789CNT
|
||||
|| s->s3->tmp.new_cipher->algorithm_enc == SSL_eGOST2814789CNT12)
|
||||
s->tlsext_use_etm = 0;
|
||||
else {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the ETM type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_encrypt_then_mac, ret);
|
||||
s2n(0, ret);
|
||||
}
|
||||
}
|
||||
if (s->s3->flags & TLS1_FLAGS_RECEIVED_EXTMS) {
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the EMS type and extension length
|
||||
*/
|
||||
if (CHECKLEN(ret, 4, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_extended_master_secret, ret);
|
||||
s2n(0, ret);
|
||||
}
|
||||
|
||||
if (s->s3->alpn_selected != NULL) {
|
||||
const unsigned char *selected = s->s3->alpn_selected;
|
||||
size_t len = s->s3->alpn_selected_len;
|
||||
|
||||
/*-
|
||||
* check for enough space.
|
||||
* 4 bytes for the ALPN type and extension length
|
||||
* 2 bytes for ALPN data length
|
||||
* 1 byte for selected protocol length
|
||||
* + length of the selected protocol
|
||||
*/
|
||||
if (CHECKLEN(ret, 7 + len, limit))
|
||||
return NULL;
|
||||
s2n(TLSEXT_TYPE_application_layer_protocol_negotiation, ret);
|
||||
s2n(3 + len, ret);
|
||||
s2n(1 + len, ret);
|
||||
*ret++ = len;
|
||||
memcpy(ret, selected, len);
|
||||
ret += len;
|
||||
}
|
||||
|
||||
done:
|
||||
|
||||
if ((extdatalen = ret - orig - 2) == 0)
|
||||
return orig;
|
||||
|
||||
s2n(extdatalen, orig);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Save the ALPN extension in a ClientHello.
|
||||
* pkt: the contents of the ALPN extension, not including type and length.
|
||||
* al: a pointer to the alert value to send in the event of a failure.
|
||||
* returns: 1 on success, 0 on error.
|
||||
*/
|
||||
static int tls1_alpn_handle_client_hello(SSL *s, PACKET *pkt, int *al)
|
||||
{
|
||||
PACKET protocol_list, save_protocol_list, protocol;
|
||||
|
||||
*al = SSL_AD_DECODE_ERROR;
|
||||
|
||||
if (!PACKET_as_length_prefixed_2(pkt, &protocol_list)
|
||||
|| PACKET_remaining(&protocol_list) < 2) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
save_protocol_list = protocol_list;
|
||||
do {
|
||||
/* Protocol names can't be empty. */
|
||||
if (!PACKET_get_length_prefixed_1(&protocol_list, &protocol)
|
||||
|| PACKET_remaining(&protocol) == 0) {
|
||||
return 0;
|
||||
}
|
||||
} while (PACKET_remaining(&protocol_list) != 0);
|
||||
|
||||
if (!PACKET_memdup(&save_protocol_list,
|
||||
&s->s3->alpn_proposed, &s->s3->alpn_proposed_len)) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Process the ALPN extension in a ClientHello.
|
||||
* al: a pointer to the alert value to send in the event of a failure.
|
||||
* returns 1 on success, 0 on error.
|
||||
*/
|
||||
static int tls1_alpn_handle_client_hello_late(SSL *s, int *al)
|
||||
{
|
||||
const unsigned char *selected = NULL;
|
||||
unsigned char selected_len = 0;
|
||||
|
||||
if (s->ctx->alpn_select_cb != NULL && s->s3->alpn_proposed != NULL) {
|
||||
int r = s->ctx->alpn_select_cb(s, &selected, &selected_len,
|
||||
s->s3->alpn_proposed,
|
||||
s->s3->alpn_proposed_len,
|
||||
s->ctx->alpn_select_cb_arg);
|
||||
|
||||
if (r == SSL_TLSEXT_ERR_OK) {
|
||||
OPENSSL_free(s->s3->alpn_selected);
|
||||
s->s3->alpn_selected = OPENSSL_memdup(selected, selected_len);
|
||||
if (s->s3->alpn_selected == NULL) {
|
||||
*al = SSL_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
s->s3->alpn_selected_len = selected_len;
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
/* ALPN takes precedence over NPN. */
|
||||
s->s3->next_proto_neg_seen = 0;
|
||||
#endif
|
||||
} else if (r == SSL_TLSEXT_ERR_NOACK) {
|
||||
/* Behave as if no callback was present. */
|
||||
return 1;
|
||||
} else {
|
||||
*al = SSL_AD_NO_APPLICATION_PROTOCOL;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
/*-
|
||||
* ssl_check_for_safari attempts to fingerprint Safari using OS X
|
||||
* SecureTransport using the TLS extension block in |pkt|.
|
||||
* Safari, since 10.6, sends exactly these extensions, in this order:
|
||||
* SNI,
|
||||
* elliptic_curves
|
||||
* ec_point_formats
|
||||
*
|
||||
* We wish to fingerprint Safari because they broke ECDHE-ECDSA support in 10.8,
|
||||
* but they advertise support. So enabling ECDHE-ECDSA ciphers breaks them.
|
||||
* Sadly we cannot differentiate 10.6, 10.7 and 10.8.4 (which work), from
|
||||
* 10.8..10.8.3 (which don't work).
|
||||
*/
|
||||
static void ssl_check_for_safari(SSL *s, const PACKET *pkt)
|
||||
{
|
||||
unsigned int type;
|
||||
PACKET sni, tmppkt;
|
||||
size_t ext_len;
|
||||
|
||||
static const unsigned char kSafariExtensionsBlock[] = {
|
||||
0x00, 0x0a, /* elliptic_curves extension */
|
||||
0x00, 0x08, /* 8 bytes */
|
||||
0x00, 0x06, /* 6 bytes of curve ids */
|
||||
0x00, 0x17, /* P-256 */
|
||||
0x00, 0x18, /* P-384 */
|
||||
0x00, 0x19, /* P-521 */
|
||||
|
||||
0x00, 0x0b, /* ec_point_formats */
|
||||
0x00, 0x02, /* 2 bytes */
|
||||
0x01, /* 1 point format */
|
||||
0x00, /* uncompressed */
|
||||
/* The following is only present in TLS 1.2 */
|
||||
0x00, 0x0d, /* signature_algorithms */
|
||||
0x00, 0x0c, /* 12 bytes */
|
||||
0x00, 0x0a, /* 10 bytes */
|
||||
0x05, 0x01, /* SHA-384/RSA */
|
||||
0x04, 0x01, /* SHA-256/RSA */
|
||||
0x02, 0x01, /* SHA-1/RSA */
|
||||
0x04, 0x03, /* SHA-256/ECDSA */
|
||||
0x02, 0x03, /* SHA-1/ECDSA */
|
||||
};
|
||||
|
||||
/* Length of the common prefix (first two extensions). */
|
||||
static const size_t kSafariCommonExtensionsLength = 18;
|
||||
|
||||
tmppkt = *pkt;
|
||||
|
||||
if (!PACKET_forward(&tmppkt, 2)
|
||||
|| !PACKET_get_net_2(&tmppkt, &type)
|
||||
|| !PACKET_get_length_prefixed_2(&tmppkt, &sni)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (type != TLSEXT_TYPE_server_name)
|
||||
return;
|
||||
|
||||
ext_len = TLS1_get_client_version(s) >= TLS1_2_VERSION ?
|
||||
sizeof(kSafariExtensionsBlock) : kSafariCommonExtensionsLength;
|
||||
|
||||
s->s3->is_probably_safari = PACKET_equal(&tmppkt, kSafariExtensionsBlock,
|
||||
ext_len);
|
||||
}
|
||||
#endif /* !OPENSSL_NO_EC */
|
||||
|
||||
/*
|
||||
* Parse ClientHello extensions and stash extension info in various parts of
|
||||
* the SSL object. Verify that there are no duplicate extensions.
|
||||
*
|
||||
* Behaviour upon resumption is extension-specific. If the extension has no
|
||||
* effect during resumption, it is parsed (to verify its format) but otherwise
|
||||
* ignored.
|
||||
*
|
||||
* Consumes the entire packet in |pkt|. Returns 1 on success and 0 on failure.
|
||||
* Upon failure, sets |al| to the appropriate alert.
|
||||
*/
|
||||
static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al)
|
||||
{
|
||||
unsigned int type;
|
||||
int renegotiate_seen = 0;
|
||||
PACKET extensions;
|
||||
|
||||
*al = SSL_AD_DECODE_ERROR;
|
||||
s->servername_done = 0;
|
||||
s->tlsext_status_type = -1;
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
s->s3->next_proto_neg_seen = 0;
|
||||
#endif
|
||||
|
||||
OPENSSL_free(s->s3->alpn_selected);
|
||||
s->s3->alpn_selected = NULL;
|
||||
s->s3->alpn_selected_len = 0;
|
||||
OPENSSL_free(s->s3->alpn_proposed);
|
||||
s->s3->alpn_proposed = NULL;
|
||||
s->s3->alpn_proposed_len = 0;
|
||||
#ifndef OPENSSL_NO_HEARTBEATS
|
||||
s->tlsext_heartbeat &= ~(SSL_DTLSEXT_HB_ENABLED |
|
||||
SSL_DTLSEXT_HB_DONT_SEND_REQUESTS);
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
if (s->options & SSL_OP_SAFARI_ECDHE_ECDSA_BUG)
|
||||
ssl_check_for_safari(s, pkt);
|
||||
#endif /* !OPENSSL_NO_EC */
|
||||
|
||||
/* Clear any signature algorithms extension received */
|
||||
OPENSSL_free(s->s3->tmp.peer_sigalgs);
|
||||
s->s3->tmp.peer_sigalgs = NULL;
|
||||
s->tlsext_use_etm = 0;
|
||||
|
||||
#ifndef OPENSSL_NO_SRP
|
||||
OPENSSL_free(s->srp_ctx.login);
|
||||
s->srp_ctx.login = NULL;
|
||||
#endif
|
||||
|
||||
s->srtp_profile = NULL;
|
||||
|
||||
if (PACKET_remaining(pkt) == 0)
|
||||
goto ri_check;
|
||||
|
||||
if (!PACKET_as_length_prefixed_2(pkt, &extensions))
|
||||
return 0;
|
||||
|
||||
if (!tls1_check_duplicate_extensions(&extensions))
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* We parse all extensions to ensure the ClientHello is well-formed but,
|
||||
* unless an extension specifies otherwise, we ignore extensions upon
|
||||
* resumption.
|
||||
*/
|
||||
while (PACKET_get_net_2(&extensions, &type)) {
|
||||
PACKET extension;
|
||||
if (!PACKET_get_length_prefixed_2(&extensions, &extension))
|
||||
return 0;
|
||||
|
||||
if (s->tlsext_debug_cb)
|
||||
s->tlsext_debug_cb(s, 0, type, PACKET_data(&extension),
|
||||
PACKET_remaining(&extension),
|
||||
s->tlsext_debug_arg);
|
||||
|
||||
if (type == TLSEXT_TYPE_renegotiate) {
|
||||
if (!ssl_parse_clienthello_renegotiate_ext(s, &extension, al))
|
||||
return 0;
|
||||
renegotiate_seen = 1;
|
||||
} else if (s->version == SSL3_VERSION) {
|
||||
}
|
||||
/*-
|
||||
* The servername extension is treated as follows:
|
||||
*
|
||||
* - Only the hostname type is supported with a maximum length of 255.
|
||||
* - The servername is rejected if too long or if it contains zeros,
|
||||
* in which case an fatal alert is generated.
|
||||
* - The servername field is maintained together with the session cache.
|
||||
* - When a session is resumed, the servername call back invoked in order
|
||||
* to allow the application to position itself to the right context.
|
||||
* - The servername is acknowledged if it is new for a session or when
|
||||
* it is identical to a previously used for the same session.
|
||||
* Applications can control the behaviour. They can at any time
|
||||
* set a 'desirable' servername for a new SSL object. This can be the
|
||||
* case for example with HTTPS when a Host: header field is received and
|
||||
* a renegotiation is requested. In this case, a possible servername
|
||||
* presented in the new client hello is only acknowledged if it matches
|
||||
* the value of the Host: field.
|
||||
* - Applications must use SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
|
||||
* if they provide for changing an explicit servername context for the
|
||||
* session, i.e. when the session has been established with a servername
|
||||
* extension.
|
||||
* - On session reconnect, the servername extension may be absent.
|
||||
*
|
||||
*/
|
||||
|
||||
else if (type == TLSEXT_TYPE_server_name) {
|
||||
unsigned int servname_type;
|
||||
PACKET sni, hostname;
|
||||
|
||||
if (!PACKET_as_length_prefixed_2(&extension, &sni)
|
||||
/* ServerNameList must be at least 1 byte long. */
|
||||
|| PACKET_remaining(&sni) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Although the server_name extension was intended to be
|
||||
* extensible to new name types, RFC 4366 defined the
|
||||
* syntax inextensibility and OpenSSL 1.0.x parses it as
|
||||
* such.
|
||||
* RFC 6066 corrected the mistake but adding new name types
|
||||
* is nevertheless no longer feasible, so act as if no other
|
||||
* SNI types can exist, to simplify parsing.
|
||||
*
|
||||
* Also note that the RFC permits only one SNI value per type,
|
||||
* i.e., we can only have a single hostname.
|
||||
*/
|
||||
if (!PACKET_get_1(&sni, &servname_type)
|
||||
|| servname_type != TLSEXT_NAMETYPE_host_name
|
||||
|| !PACKET_as_length_prefixed_2(&sni, &hostname)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!s->hit) {
|
||||
if (PACKET_remaining(&hostname) > TLSEXT_MAXLEN_host_name) {
|
||||
*al = TLS1_AD_UNRECOGNIZED_NAME;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (PACKET_contains_zero_byte(&hostname)) {
|
||||
*al = TLS1_AD_UNRECOGNIZED_NAME;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!PACKET_strndup(&hostname, &s->session->tlsext_hostname)) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
|
||||
s->servername_done = 1;
|
||||
} else {
|
||||
/*
|
||||
* TODO(openssl-team): if the SNI doesn't match, we MUST
|
||||
* fall back to a full handshake.
|
||||
*/
|
||||
s->servername_done = s->session->tlsext_hostname
|
||||
&& PACKET_equal(&hostname, s->session->tlsext_hostname,
|
||||
strlen(s->session->tlsext_hostname));
|
||||
}
|
||||
}
|
||||
#ifndef OPENSSL_NO_SRP
|
||||
else if (type == TLSEXT_TYPE_srp) {
|
||||
PACKET srp_I;
|
||||
|
||||
if (!PACKET_as_length_prefixed_1(&extension, &srp_I))
|
||||
return 0;
|
||||
|
||||
if (PACKET_contains_zero_byte(&srp_I))
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* TODO(openssl-team): currently, we re-authenticate the user
|
||||
* upon resumption. Instead, we MUST ignore the login.
|
||||
*/
|
||||
if (!PACKET_strndup(&srp_I, &s->srp_ctx.login)) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
else if (type == TLSEXT_TYPE_ec_point_formats) {
|
||||
PACKET ec_point_format_list;
|
||||
|
||||
if (!PACKET_as_length_prefixed_1(&extension, &ec_point_format_list)
|
||||
|| PACKET_remaining(&ec_point_format_list) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!s->hit) {
|
||||
if (!PACKET_memdup(&ec_point_format_list,
|
||||
&s->session->tlsext_ecpointformatlist,
|
||||
&s->
|
||||
session->tlsext_ecpointformatlist_length)) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
} else if (type == TLSEXT_TYPE_elliptic_curves) {
|
||||
PACKET elliptic_curve_list;
|
||||
|
||||
/* Each NamedCurve is 2 bytes and we must have at least 1. */
|
||||
if (!PACKET_as_length_prefixed_2(&extension, &elliptic_curve_list)
|
||||
|| PACKET_remaining(&elliptic_curve_list) == 0
|
||||
|| (PACKET_remaining(&elliptic_curve_list) % 2) != 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!s->hit) {
|
||||
if (!PACKET_memdup(&elliptic_curve_list,
|
||||
&s->session->tlsext_ellipticcurvelist,
|
||||
&s->
|
||||
session->tlsext_ellipticcurvelist_length)) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
else if (type == TLSEXT_TYPE_session_ticket) {
|
||||
if (s->tls_session_ticket_ext_cb &&
|
||||
!s->tls_session_ticket_ext_cb(s, PACKET_data(&extension),
|
||||
PACKET_remaining(&extension),
|
||||
s->tls_session_ticket_ext_cb_arg))
|
||||
{
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
} else if (type == TLSEXT_TYPE_signature_algorithms) {
|
||||
PACKET supported_sig_algs;
|
||||
|
||||
if (!PACKET_as_length_prefixed_2(&extension, &supported_sig_algs)
|
||||
|| (PACKET_remaining(&supported_sig_algs) % 2) != 0
|
||||
|| PACKET_remaining(&supported_sig_algs) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!s->hit) {
|
||||
if (!tls1_save_sigalgs(s, PACKET_data(&supported_sig_algs),
|
||||
PACKET_remaining(&supported_sig_algs))) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
} else if (type == TLSEXT_TYPE_status_request) {
|
||||
if (!PACKET_get_1(&extension,
|
||||
(unsigned int *)&s->tlsext_status_type)) {
|
||||
return 0;
|
||||
}
|
||||
#ifndef OPENSSL_NO_OCSP
|
||||
if (s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp) {
|
||||
const unsigned char *ext_data;
|
||||
PACKET responder_id_list, exts;
|
||||
if (!PACKET_get_length_prefixed_2
|
||||
(&extension, &responder_id_list))
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* We remove any OCSP_RESPIDs from a previous handshake
|
||||
* to prevent unbounded memory growth - CVE-2016-6304
|
||||
*/
|
||||
sk_OCSP_RESPID_pop_free(s->tlsext_ocsp_ids,
|
||||
OCSP_RESPID_free);
|
||||
if (PACKET_remaining(&responder_id_list) > 0) {
|
||||
s->tlsext_ocsp_ids = sk_OCSP_RESPID_new_null();
|
||||
if (s->tlsext_ocsp_ids == NULL) {
|
||||
*al = SSL_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
s->tlsext_ocsp_ids = NULL;
|
||||
}
|
||||
|
||||
while (PACKET_remaining(&responder_id_list) > 0) {
|
||||
OCSP_RESPID *id;
|
||||
PACKET responder_id;
|
||||
const unsigned char *id_data;
|
||||
|
||||
if (!PACKET_get_length_prefixed_2(&responder_id_list,
|
||||
&responder_id)
|
||||
|| PACKET_remaining(&responder_id) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
id_data = PACKET_data(&responder_id);
|
||||
id = d2i_OCSP_RESPID(NULL, &id_data,
|
||||
PACKET_remaining(&responder_id));
|
||||
if (id == NULL)
|
||||
return 0;
|
||||
|
||||
if (id_data != PACKET_end(&responder_id)) {
|
||||
OCSP_RESPID_free(id);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!sk_OCSP_RESPID_push(s->tlsext_ocsp_ids, id)) {
|
||||
OCSP_RESPID_free(id);
|
||||
*al = SSL_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Read in request_extensions */
|
||||
if (!PACKET_as_length_prefixed_2(&extension, &exts))
|
||||
return 0;
|
||||
|
||||
if (PACKET_remaining(&exts) > 0) {
|
||||
ext_data = PACKET_data(&exts);
|
||||
sk_X509_EXTENSION_pop_free(s->tlsext_ocsp_exts,
|
||||
X509_EXTENSION_free);
|
||||
s->tlsext_ocsp_exts =
|
||||
d2i_X509_EXTENSIONS(NULL, &ext_data,
|
||||
PACKET_remaining(&exts));
|
||||
if (s->tlsext_ocsp_exts == NULL
|
||||
|| ext_data != PACKET_end(&exts)) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
/*
|
||||
* We don't know what to do with any other type so ignore it.
|
||||
*/
|
||||
s->tlsext_status_type = -1;
|
||||
}
|
||||
}
|
||||
#ifndef OPENSSL_NO_HEARTBEATS
|
||||
else if (SSL_IS_DTLS(s) && type == TLSEXT_TYPE_heartbeat) {
|
||||
unsigned int hbtype;
|
||||
|
||||
if (!PACKET_get_1(&extension, &hbtype)
|
||||
|| PACKET_remaining(&extension)) {
|
||||
*al = SSL_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
switch (hbtype) {
|
||||
case 0x01: /* Client allows us to send HB requests */
|
||||
s->tlsext_heartbeat |= SSL_DTLSEXT_HB_ENABLED;
|
||||
break;
|
||||
case 0x02: /* Client doesn't accept HB requests */
|
||||
s->tlsext_heartbeat |= SSL_DTLSEXT_HB_ENABLED;
|
||||
s->tlsext_heartbeat |= SSL_DTLSEXT_HB_DONT_SEND_REQUESTS;
|
||||
break;
|
||||
default:
|
||||
*al = SSL_AD_ILLEGAL_PARAMETER;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
else if (type == TLSEXT_TYPE_next_proto_neg &&
|
||||
s->s3->tmp.finish_md_len == 0) {
|
||||
/*-
|
||||
* We shouldn't accept this extension on a
|
||||
* renegotiation.
|
||||
*
|
||||
* s->new_session will be set on renegotiation, but we
|
||||
* probably shouldn't rely that it couldn't be set on
|
||||
* the initial renegotiation too in certain cases (when
|
||||
* there's some other reason to disallow resuming an
|
||||
* earlier session -- the current code won't be doing
|
||||
* anything like that, but this might change).
|
||||
*
|
||||
* A valid sign that there's been a previous handshake
|
||||
* in this connection is if s->s3->tmp.finish_md_len >
|
||||
* 0. (We are talking about a check that will happen
|
||||
* in the Hello protocol round, well before a new
|
||||
* Finished message could have been computed.)
|
||||
*/
|
||||
s->s3->next_proto_neg_seen = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
else if (type == TLSEXT_TYPE_application_layer_protocol_negotiation &&
|
||||
s->s3->tmp.finish_md_len == 0) {
|
||||
if (!tls1_alpn_handle_client_hello(s, &extension, al))
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* session ticket processed earlier */
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
else if (SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s)
|
||||
&& type == TLSEXT_TYPE_use_srtp) {
|
||||
if (ssl_parse_clienthello_use_srtp_ext(s, &extension, al))
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
else if (type == TLSEXT_TYPE_encrypt_then_mac &&
|
||||
!(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC))
|
||||
s->tlsext_use_etm = 1;
|
||||
/*
|
||||
* Note: extended master secret extension handled in
|
||||
* tls_check_serverhello_tlsext_early()
|
||||
*/
|
||||
|
||||
/*
|
||||
* If this ClientHello extension was unhandled and this is a
|
||||
* nonresumed connection, check whether the extension is a custom
|
||||
* TLS Extension (has a custom_srv_ext_record), and if so call the
|
||||
* callback and record the extension number so that an appropriate
|
||||
* ServerHello may be later returned.
|
||||
*/
|
||||
else if (!s->hit) {
|
||||
if (custom_ext_parse(s, 1, type, PACKET_data(&extension),
|
||||
PACKET_remaining(&extension), al) <= 0)
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (PACKET_remaining(pkt) != 0) {
|
||||
/*
|
||||
* tls1_check_duplicate_extensions should ensure this never happens.
|
||||
*/
|
||||
*al = SSL_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
|
||||
ri_check:
|
||||
|
||||
/* Need RI if renegotiating */
|
||||
|
||||
if (!renegotiate_seen && s->renegotiate &&
|
||||
!(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
|
||||
*al = SSL_AD_HANDSHAKE_FAILURE;
|
||||
SSLerr(SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT,
|
||||
SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* This function currently has no state to clean up, so it returns directly.
|
||||
* If parsing fails at any point, the function returns early.
|
||||
* The SSL object may be left with partial data from extensions, but it must
|
||||
* then no longer be used, and clearing it up will free the leftovers.
|
||||
*/
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ssl_parse_clienthello_tlsext(SSL *s, PACKET *pkt)
|
||||
{
|
||||
int al = -1;
|
||||
custom_ext_init(&s->cert->srv_ext);
|
||||
if (ssl_scan_clienthello_tlsext(s, pkt, &al) <= 0) {
|
||||
ssl3_send_alert(s, SSL3_AL_FATAL, al);
|
||||
return 0;
|
||||
}
|
||||
if (ssl_check_clienthello_tlsext_early(s) <= 0) {
|
||||
SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT, SSL_R_CLIENTHELLO_TLSEXT);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
/*
|
||||
* ssl_next_proto_validate validates a Next Protocol Negotiation block. No
|
||||
* elements of zero length are allowed and the set of elements must exactly
|
||||
* fill the length of the block.
|
||||
*/
|
||||
static char ssl_next_proto_validate(PACKET *pkt)
|
||||
{
|
||||
PACKET tmp_protocol;
|
||||
|
||||
while (PACKET_remaining(pkt)) {
|
||||
if (!PACKET_get_length_prefixed_1(pkt, &tmp_protocol)
|
||||
|| PACKET_remaining(&tmp_protocol) == 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int ssl_scan_serverhello_tlsext(SSL *s, PACKET *pkt, int *al)
|
||||
{
|
||||
unsigned int length, type, size;
|
||||
int tlsext_servername = 0;
|
||||
int renegotiate_seen = 0;
|
||||
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
s->s3->next_proto_neg_seen = 0;
|
||||
#endif
|
||||
s->tlsext_ticket_expected = 0;
|
||||
|
||||
OPENSSL_free(s->s3->alpn_selected);
|
||||
s->s3->alpn_selected = NULL;
|
||||
#ifndef OPENSSL_NO_HEARTBEATS
|
||||
s->tlsext_heartbeat &= ~(SSL_DTLSEXT_HB_ENABLED |
|
||||
SSL_DTLSEXT_HB_DONT_SEND_REQUESTS);
|
||||
#endif
|
||||
|
||||
s->tlsext_use_etm = 0;
|
||||
|
||||
s->s3->flags &= ~TLS1_FLAGS_RECEIVED_EXTMS;
|
||||
|
||||
if (!PACKET_get_net_2(pkt, &length))
|
||||
goto ri_check;
|
||||
|
||||
if (PACKET_remaining(pkt) != length) {
|
||||
*al = SSL_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!tls1_check_duplicate_extensions(pkt)) {
|
||||
*al = SSL_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
|
||||
while (PACKET_get_net_2(pkt, &type) && PACKET_get_net_2(pkt, &size)) {
|
||||
const unsigned char *data;
|
||||
PACKET spkt;
|
||||
|
||||
if (!PACKET_get_sub_packet(pkt, &spkt, size)
|
||||
|| !PACKET_peek_bytes(&spkt, &data, size))
|
||||
goto ri_check;
|
||||
|
||||
if (s->tlsext_debug_cb)
|
||||
s->tlsext_debug_cb(s, 1, type, data, size, s->tlsext_debug_arg);
|
||||
|
||||
if (type == TLSEXT_TYPE_renegotiate) {
|
||||
if (!ssl_parse_serverhello_renegotiate_ext(s, &spkt, al))
|
||||
return 0;
|
||||
renegotiate_seen = 1;
|
||||
} else if (s->version == SSL3_VERSION) {
|
||||
} else if (type == TLSEXT_TYPE_server_name) {
|
||||
if (s->tlsext_hostname == NULL || size > 0) {
|
||||
*al = TLS1_AD_UNRECOGNIZED_NAME;
|
||||
return 0;
|
||||
}
|
||||
tlsext_servername = 1;
|
||||
}
|
||||
#ifndef OPENSSL_NO_EC
|
||||
else if (type == TLSEXT_TYPE_ec_point_formats) {
|
||||
unsigned int ecpointformatlist_length;
|
||||
if (!PACKET_get_1(&spkt, &ecpointformatlist_length)
|
||||
|| ecpointformatlist_length != size - 1) {
|
||||
*al = TLS1_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
if (!s->hit) {
|
||||
s->session->tlsext_ecpointformatlist_length = 0;
|
||||
OPENSSL_free(s->session->tlsext_ecpointformatlist);
|
||||
if ((s->session->tlsext_ecpointformatlist =
|
||||
OPENSSL_malloc(ecpointformatlist_length)) == NULL) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
s->session->tlsext_ecpointformatlist_length =
|
||||
ecpointformatlist_length;
|
||||
if (!PACKET_copy_bytes(&spkt,
|
||||
s->session->tlsext_ecpointformatlist,
|
||||
ecpointformatlist_length)) {
|
||||
*al = TLS1_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
|
||||
else if (type == TLSEXT_TYPE_session_ticket) {
|
||||
if (s->tls_session_ticket_ext_cb &&
|
||||
!s->tls_session_ticket_ext_cb(s, data, size,
|
||||
s->tls_session_ticket_ext_cb_arg))
|
||||
{
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
if (!tls_use_ticket(s) || (size > 0)) {
|
||||
*al = TLS1_AD_UNSUPPORTED_EXTENSION;
|
||||
return 0;
|
||||
}
|
||||
s->tlsext_ticket_expected = 1;
|
||||
} else if (type == TLSEXT_TYPE_status_request) {
|
||||
/*
|
||||
* MUST be empty and only sent if we've requested a status
|
||||
* request message.
|
||||
*/
|
||||
if ((s->tlsext_status_type == -1) || (size > 0)) {
|
||||
*al = TLS1_AD_UNSUPPORTED_EXTENSION;
|
||||
return 0;
|
||||
}
|
||||
/* Set flag to expect CertificateStatus message */
|
||||
s->tlsext_status_expected = 1;
|
||||
}
|
||||
#ifndef OPENSSL_NO_CT
|
||||
/*
|
||||
* Only take it if we asked for it - i.e if there is no CT validation
|
||||
* callback set, then a custom extension MAY be processing it, so we
|
||||
* need to let control continue to flow to that.
|
||||
*/
|
||||
else if (type == TLSEXT_TYPE_signed_certificate_timestamp &&
|
||||
s->ct_validation_callback != NULL) {
|
||||
/* Simply copy it off for later processing */
|
||||
if (s->tlsext_scts != NULL) {
|
||||
OPENSSL_free(s->tlsext_scts);
|
||||
s->tlsext_scts = NULL;
|
||||
}
|
||||
s->tlsext_scts_len = size;
|
||||
if (size > 0) {
|
||||
s->tlsext_scts = OPENSSL_malloc(size);
|
||||
if (s->tlsext_scts == NULL) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
memcpy(s->tlsext_scts, data, size);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_NEXTPROTONEG
|
||||
else if (type == TLSEXT_TYPE_next_proto_neg &&
|
||||
s->s3->tmp.finish_md_len == 0) {
|
||||
unsigned char *selected;
|
||||
unsigned char selected_len;
|
||||
/* We must have requested it. */
|
||||
if (s->ctx->next_proto_select_cb == NULL) {
|
||||
*al = TLS1_AD_UNSUPPORTED_EXTENSION;
|
||||
return 0;
|
||||
}
|
||||
/* The data must be valid */
|
||||
if (!ssl_next_proto_validate(&spkt)) {
|
||||
*al = TLS1_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
if (s->ctx->next_proto_select_cb(s, &selected, &selected_len, data,
|
||||
size,
|
||||
s->
|
||||
ctx->next_proto_select_cb_arg) !=
|
||||
SSL_TLSEXT_ERR_OK) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
* Could be non-NULL if server has sent multiple NPN extensions in
|
||||
* a single Serverhello
|
||||
*/
|
||||
OPENSSL_free(s->next_proto_negotiated);
|
||||
s->next_proto_negotiated = OPENSSL_malloc(selected_len);
|
||||
if (s->next_proto_negotiated == NULL) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
memcpy(s->next_proto_negotiated, selected, selected_len);
|
||||
s->next_proto_negotiated_len = selected_len;
|
||||
s->s3->next_proto_neg_seen = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
else if (type == TLSEXT_TYPE_application_layer_protocol_negotiation) {
|
||||
unsigned len;
|
||||
/* We must have requested it. */
|
||||
if (!s->s3->alpn_sent) {
|
||||
*al = TLS1_AD_UNSUPPORTED_EXTENSION;
|
||||
return 0;
|
||||
}
|
||||
/*-
|
||||
* The extension data consists of:
|
||||
* uint16 list_length
|
||||
* uint8 proto_length;
|
||||
* uint8 proto[proto_length];
|
||||
*/
|
||||
if (!PACKET_get_net_2(&spkt, &len)
|
||||
|| PACKET_remaining(&spkt) != len || !PACKET_get_1(&spkt, &len)
|
||||
|| PACKET_remaining(&spkt) != len) {
|
||||
*al = TLS1_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
OPENSSL_free(s->s3->alpn_selected);
|
||||
s->s3->alpn_selected = OPENSSL_malloc(len);
|
||||
if (s->s3->alpn_selected == NULL) {
|
||||
*al = TLS1_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
if (!PACKET_copy_bytes(&spkt, s->s3->alpn_selected, len)) {
|
||||
*al = TLS1_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
s->s3->alpn_selected_len = len;
|
||||
}
|
||||
#ifndef OPENSSL_NO_HEARTBEATS
|
||||
else if (SSL_IS_DTLS(s) && type == TLSEXT_TYPE_heartbeat) {
|
||||
unsigned int hbtype;
|
||||
if (!PACKET_get_1(&spkt, &hbtype)) {
|
||||
*al = SSL_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
switch (hbtype) {
|
||||
case 0x01: /* Server allows us to send HB requests */
|
||||
s->tlsext_heartbeat |= SSL_DTLSEXT_HB_ENABLED;
|
||||
break;
|
||||
case 0x02: /* Server doesn't accept HB requests */
|
||||
s->tlsext_heartbeat |= SSL_DTLSEXT_HB_ENABLED;
|
||||
s->tlsext_heartbeat |= SSL_DTLSEXT_HB_DONT_SEND_REQUESTS;
|
||||
break;
|
||||
default:
|
||||
*al = SSL_AD_ILLEGAL_PARAMETER;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
else if (SSL_IS_DTLS(s) && type == TLSEXT_TYPE_use_srtp) {
|
||||
if (ssl_parse_serverhello_use_srtp_ext(s, &spkt, al))
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
else if (type == TLSEXT_TYPE_encrypt_then_mac) {
|
||||
/* Ignore if inappropriate ciphersuite */
|
||||
if (!(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC) &&
|
||||
s->s3->tmp.new_cipher->algorithm_mac != SSL_AEAD
|
||||
&& s->s3->tmp.new_cipher->algorithm_enc != SSL_RC4)
|
||||
s->tlsext_use_etm = 1;
|
||||
} else if (type == TLSEXT_TYPE_extended_master_secret) {
|
||||
s->s3->flags |= TLS1_FLAGS_RECEIVED_EXTMS;
|
||||
if (!s->hit)
|
||||
s->session->flags |= SSL_SESS_FLAG_EXTMS;
|
||||
}
|
||||
/*
|
||||
* If this extension type was not otherwise handled, but matches a
|
||||
* custom_cli_ext_record, then send it to the c callback
|
||||
*/
|
||||
else if (custom_ext_parse(s, 0, type, data, size, al) <= 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (PACKET_remaining(pkt) != 0) {
|
||||
*al = SSL_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!s->hit && tlsext_servername == 1) {
|
||||
if (s->tlsext_hostname) {
|
||||
if (s->session->tlsext_hostname == NULL) {
|
||||
s->session->tlsext_hostname =
|
||||
OPENSSL_strdup(s->tlsext_hostname);
|
||||
if (!s->session->tlsext_hostname) {
|
||||
*al = SSL_AD_UNRECOGNIZED_NAME;
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
*al = SSL_AD_DECODE_ERROR;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ri_check:
|
||||
|
||||
/*
|
||||
* Determine if we need to see RI. Strictly speaking if we want to avoid
|
||||
* an attack we should *always* see RI even on initial server hello
|
||||
* because the client doesn't see any renegotiation during an attack.
|
||||
* However this would mean we could not connect to any server which
|
||||
* doesn't support RI so for the immediate future tolerate RI absence
|
||||
*/
|
||||
if (!renegotiate_seen && !(s->options & SSL_OP_LEGACY_SERVER_CONNECT)
|
||||
&& !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
|
||||
*al = SSL_AD_HANDSHAKE_FAILURE;
|
||||
SSLerr(SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT,
|
||||
SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (s->hit) {
|
||||
/*
|
||||
* Check extended master secret extension is consistent with
|
||||
* original session.
|
||||
*/
|
||||
if (!(s->s3->flags & TLS1_FLAGS_RECEIVED_EXTMS) !=
|
||||
!(s->session->flags & SSL_SESS_FLAG_EXTMS)) {
|
||||
*al = SSL_AD_HANDSHAKE_FAILURE;
|
||||
SSLerr(SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT, SSL_R_INCONSISTENT_EXTMS);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ssl_prepare_clienthello_tlsext(SSL *s)
|
||||
{
|
||||
s->s3->alpn_sent = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ssl_prepare_serverhello_tlsext(SSL *s)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int ssl_check_clienthello_tlsext_early(SSL *s)
|
||||
{
|
||||
int ret = SSL_TLSEXT_ERR_NOACK;
|
||||
int al = SSL_AD_UNRECOGNIZED_NAME;
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
/*
|
||||
* The handling of the ECPointFormats extension is done elsewhere, namely
|
||||
* in ssl3_choose_cipher in s3_lib.c.
|
||||
*/
|
||||
/*
|
||||
* The handling of the EllipticCurves extension is done elsewhere, namely
|
||||
* in ssl3_choose_cipher in s3_lib.c.
|
||||
*/
|
||||
#endif
|
||||
|
||||
if (s->ctx != NULL && s->ctx->tlsext_servername_callback != 0)
|
||||
ret =
|
||||
s->ctx->tlsext_servername_callback(s, &al,
|
||||
s->ctx->tlsext_servername_arg);
|
||||
else if (s->session_ctx != NULL
|
||||
&& s->session_ctx->tlsext_servername_callback != 0)
|
||||
ret =
|
||||
s->session_ctx->tlsext_servername_callback(s, &al,
|
||||
s->
|
||||
session_ctx->tlsext_servername_arg);
|
||||
|
||||
switch (ret) {
|
||||
case SSL_TLSEXT_ERR_ALERT_FATAL:
|
||||
ssl3_send_alert(s, SSL3_AL_FATAL, al);
|
||||
return -1;
|
||||
|
||||
case SSL_TLSEXT_ERR_ALERT_WARNING:
|
||||
ssl3_send_alert(s, SSL3_AL_WARNING, al);
|
||||
return 1;
|
||||
|
||||
case SSL_TLSEXT_ERR_NOACK:
|
||||
s->servername_done = 0;
|
||||
/* fall thru */
|
||||
default:
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Initialise digests to default values */
|
||||
void ssl_set_default_md(SSL *s)
|
||||
{
|
||||
const EVP_MD **pmd = s->s3->tmp.md;
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
pmd[SSL_PKEY_DSA_SIGN] = ssl_md(SSL_MD_SHA1_IDX);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
if (SSL_USE_SIGALGS(s))
|
||||
pmd[SSL_PKEY_RSA_SIGN] = ssl_md(SSL_MD_SHA1_IDX);
|
||||
else
|
||||
pmd[SSL_PKEY_RSA_SIGN] = ssl_md(SSL_MD_MD5_SHA1_IDX);
|
||||
pmd[SSL_PKEY_RSA_ENC] = pmd[SSL_PKEY_RSA_SIGN];
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
pmd[SSL_PKEY_ECC] = ssl_md(SSL_MD_SHA1_IDX);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_GOST
|
||||
pmd[SSL_PKEY_GOST01] = ssl_md(SSL_MD_GOST94_IDX);
|
||||
pmd[SSL_PKEY_GOST12_256] = ssl_md(SSL_MD_GOST12_256_IDX);
|
||||
pmd[SSL_PKEY_GOST12_512] = ssl_md(SSL_MD_GOST12_512_IDX);
|
||||
#endif
|
||||
}
|
||||
|
||||
int tls1_set_server_sigalgs(SSL *s)
|
||||
{
|
||||
int al;
|
||||
size_t i;
|
||||
|
||||
/* Clear any shared signature algorithms */
|
||||
OPENSSL_free(s->cert->shared_sigalgs);
|
||||
s->cert->shared_sigalgs = NULL;
|
||||
s->cert->shared_sigalgslen = 0;
|
||||
/* Clear certificate digests and validity flags */
|
||||
for (i = 0; i < SSL_PKEY_NUM; i++) {
|
||||
s->s3->tmp.md[i] = NULL;
|
||||
/* Clear certificate validity flags */
|
||||
for (i = 0; i < SSL_PKEY_NUM; i++)
|
||||
s->s3->tmp.valid_flags[i] = 0;
|
||||
/*
|
||||
* If peer sent no signature algorithms check to see if we support
|
||||
* the default algorithm for each certificate type
|
||||
*/
|
||||
if (s->s3->tmp.peer_cert_sigalgs == NULL
|
||||
&& s->s3->tmp.peer_sigalgs == NULL) {
|
||||
const uint16_t *sent_sigs;
|
||||
size_t sent_sigslen = tls12_get_psigalgs(s, 1, &sent_sigs);
|
||||
|
||||
for (i = 0; i < SSL_PKEY_NUM; i++) {
|
||||
const SIGALG_LOOKUP *lu = tls1_get_legacy_sigalg(s, i);
|
||||
size_t j;
|
||||
|
||||
if (lu == NULL)
|
||||
continue;
|
||||
/* Check default matches a type we sent */
|
||||
for (j = 0; j < sent_sigslen; j++) {
|
||||
if (lu->sigalg == sent_sigs[j]) {
|
||||
s->s3->tmp.valid_flags[i] = CERT_PKEY_SIGN;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* If sigalgs received process it. */
|
||||
if (s->s3->tmp.peer_sigalgs) {
|
||||
if (!tls1_process_sigalgs(s)) {
|
||||
SSLerr(SSL_F_TLS1_SET_SERVER_SIGALGS, ERR_R_MALLOC_FAILURE);
|
||||
al = SSL_AD_INTERNAL_ERROR;
|
||||
goto err;
|
||||
}
|
||||
/* Fatal error is no shared signature algorithms */
|
||||
if (!s->cert->shared_sigalgs) {
|
||||
SSLerr(SSL_F_TLS1_SET_SERVER_SIGALGS,
|
||||
SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS);
|
||||
al = SSL_AD_ILLEGAL_PARAMETER;
|
||||
goto err;
|
||||
}
|
||||
} else {
|
||||
ssl_set_default_md(s);
|
||||
if (!tls1_process_sigalgs(s)) {
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
||||
SSL_F_TLS1_SET_SERVER_SIGALGS, ERR_R_INTERNAL_ERROR);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
err:
|
||||
ssl3_send_alert(s, SSL3_AL_FATAL, al);
|
||||
if (s->cert->shared_sigalgs != NULL)
|
||||
return 1;
|
||||
|
||||
/* Fatal error if no shared signature algorithms */
|
||||
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_TLS1_SET_SERVER_SIGALGS,
|
||||
SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Upon success, returns 1.
|
||||
* Upon failure, returns 0 and sets |al| to the appropriate fatal alert.
|
||||
*/
|
||||
int ssl_check_clienthello_tlsext_late(SSL *s, int *al)
|
||||
{
|
||||
s->tlsext_status_expected = 0;
|
||||
|
||||
/*
|
||||
* If status request then ask callback what to do. Note: this must be
|
||||
* called after servername callbacks in case the certificate has changed,
|
||||
* and must be called after the cipher has been chosen because this may
|
||||
* influence which certificate is sent
|
||||
*/
|
||||
if ((s->tlsext_status_type != -1) && s->ctx && s->ctx->tlsext_status_cb) {
|
||||
int ret;
|
||||
CERT_PKEY *certpkey;
|
||||
certpkey = ssl_get_server_send_pkey(s);
|
||||
/* If no certificate can't return certificate status */
|
||||
if (certpkey != NULL) {
|
||||
/*
|
||||
* Set current certificate to one we will use so SSL_get_certificate
|
||||
* et al can pick it up.
|
||||
*/
|
||||
s->cert->key = certpkey;
|
||||
ret = s->ctx->tlsext_status_cb(s, s->ctx->tlsext_status_arg);
|
||||
switch (ret) {
|
||||
/* We don't want to send a status request response */
|
||||
case SSL_TLSEXT_ERR_NOACK:
|
||||
s->tlsext_status_expected = 0;
|
||||
break;
|
||||
/* status request response should be sent */
|
||||
case SSL_TLSEXT_ERR_OK:
|
||||
if (s->tlsext_ocsp_resp)
|
||||
s->tlsext_status_expected = 1;
|
||||
break;
|
||||
/* something bad happened */
|
||||
case SSL_TLSEXT_ERR_ALERT_FATAL:
|
||||
default:
|
||||
*al = SSL_AD_INTERNAL_ERROR;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!tls1_alpn_handle_client_hello_late(s, al)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ssl_check_serverhello_tlsext(SSL *s)
|
||||
{
|
||||
int ret = SSL_TLSEXT_ERR_NOACK;
|
||||
int al = SSL_AD_UNRECOGNIZED_NAME;
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
/*
|
||||
* If we are client and using an elliptic curve cryptography cipher
|
||||
* suite, then if server returns an EC point formats lists extension it
|
||||
* must contain uncompressed.
|
||||
*/
|
||||
unsigned long alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
|
||||
unsigned long alg_a = s->s3->tmp.new_cipher->algorithm_auth;
|
||||
if ((s->tlsext_ecpointformatlist != NULL)
|
||||
&& (s->tlsext_ecpointformatlist_length > 0)
|
||||
&& (s->session->tlsext_ecpointformatlist != NULL)
|
||||
&& (s->session->tlsext_ecpointformatlist_length > 0)
|
||||
&& ((alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA))) {
|
||||
/* we are using an ECC cipher */
|
||||
size_t i;
|
||||
unsigned char *list;
|
||||
int found_uncompressed = 0;
|
||||
list = s->session->tlsext_ecpointformatlist;
|
||||
for (i = 0; i < s->session->tlsext_ecpointformatlist_length; i++) {
|
||||
if (*(list++) == TLSEXT_ECPOINTFORMAT_uncompressed) {
|
||||
found_uncompressed = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!found_uncompressed) {
|
||||
SSLerr(SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT,
|
||||
SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
ret = SSL_TLSEXT_ERR_OK;
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
|
||||
if (s->ctx != NULL && s->ctx->tlsext_servername_callback != 0)
|
||||
ret =
|
||||
s->ctx->tlsext_servername_callback(s, &al,
|
||||
s->ctx->tlsext_servername_arg);
|
||||
else if (s->session_ctx != NULL
|
||||
&& s->session_ctx->tlsext_servername_callback != 0)
|
||||
ret =
|
||||
s->session_ctx->tlsext_servername_callback(s, &al,
|
||||
s->
|
||||
session_ctx->tlsext_servername_arg);
|
||||
|
||||
/*
|
||||
* Ensure we get sensible values passed to tlsext_status_cb in the event
|
||||
* that we don't receive a status message
|
||||
*/
|
||||
OPENSSL_free(s->tlsext_ocsp_resp);
|
||||
s->tlsext_ocsp_resp = NULL;
|
||||
s->tlsext_ocsp_resplen = -1;
|
||||
|
||||
switch (ret) {
|
||||
case SSL_TLSEXT_ERR_ALERT_FATAL:
|
||||
ssl3_send_alert(s, SSL3_AL_FATAL, al);
|
||||
return -1;
|
||||
|
||||
case SSL_TLSEXT_ERR_ALERT_WARNING:
|
||||
ssl3_send_alert(s, SSL3_AL_WARNING, al);
|
||||
return 1;
|
||||
|
||||
case SSL_TLSEXT_ERR_NOACK:
|
||||
s->servername_done = 0;
|
||||
/* fall thru */
|
||||
default:
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
int ssl_parse_serverhello_tlsext(SSL *s, PACKET *pkt)
|
||||
{
|
||||
int al = -1;
|
||||
if (s->version < SSL3_VERSION)
|
||||
return 1;
|
||||
if (ssl_scan_serverhello_tlsext(s, pkt, &al) <= 0) {
|
||||
ssl3_send_alert(s, SSL3_AL_FATAL, al);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ssl_check_serverhello_tlsext(s) <= 0) {
|
||||
SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT, SSL_R_SERVERHELLO_TLSEXT);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*-
|
||||
* Since the server cache lookup is done early on in the processing of the
|
||||
* ClientHello and other operations depend on the result some extensions
|
||||
* need to be handled at the same time.
|
||||
* Gets the ticket information supplied by the client if any.
|
||||
*
|
||||
* Two extensions are currently handled, session ticket and extended master
|
||||
* secret.
|
||||
*
|
||||
* session_id: ClientHello session ID.
|
||||
* ext: ClientHello extensions (including length prefix)
|
||||
* hello: The parsed ClientHello data
|
||||
* ret: (output) on return, if a ticket was decrypted, then this is set to
|
||||
* point to the resulting session.
|
||||
*
|
||||
* If s->tls_session_secret_cb is set then we are expecting a pre-shared key
|
||||
* ciphersuite, in which case we have no use for session tickets and one will
|
||||
* never be decrypted, nor will s->tlsext_ticket_expected be set to 1.
|
||||
* never be decrypted, nor will s->ext.ticket_expected be set to 1.
|
||||
*
|
||||
* Returns:
|
||||
* -1: fatal error, either from parsing or decrypting the ticket.
|
||||
@@ -2966,122 +1191,71 @@ int ssl_parse_serverhello_tlsext(SSL *s, PACKET *pkt)
|
||||
* 3: a ticket was successfully decrypted and *ret was set.
|
||||
*
|
||||
* Side effects:
|
||||
* Sets s->tlsext_ticket_expected to 1 if the server will have to issue
|
||||
* Sets s->ext.ticket_expected to 1 if the server will have to issue
|
||||
* a new session ticket to the client because the client indicated support
|
||||
* (and s->tls_session_secret_cb is NULL) but the client either doesn't have
|
||||
* a session ticket or we couldn't use the one it gave us, or if
|
||||
* s->ctx->tlsext_ticket_key_cb asked to renew the client's ticket.
|
||||
* Otherwise, s->tlsext_ticket_expected is set to 0.
|
||||
*
|
||||
* For extended master secret flag is set if the extension is present.
|
||||
*
|
||||
* s->ctx->ext.ticket_key_cb asked to renew the client's ticket.
|
||||
* Otherwise, s->ext.ticket_expected is set to 0.
|
||||
*/
|
||||
int tls_check_serverhello_tlsext_early(SSL *s, const PACKET *ext,
|
||||
const PACKET *session_id,
|
||||
SSL_SESSION **ret)
|
||||
TICKET_RETURN tls_get_ticket_from_client(SSL *s, CLIENTHELLO_MSG *hello,
|
||||
SSL_SESSION **ret)
|
||||
{
|
||||
unsigned int i;
|
||||
PACKET local_ext = *ext;
|
||||
int retv = -1;
|
||||
|
||||
int have_ticket = 0;
|
||||
int use_ticket = tls_use_ticket(s);
|
||||
int retv;
|
||||
size_t size;
|
||||
RAW_EXTENSION *ticketext;
|
||||
|
||||
*ret = NULL;
|
||||
s->tlsext_ticket_expected = 0;
|
||||
s->s3->flags &= ~TLS1_FLAGS_RECEIVED_EXTMS;
|
||||
s->ext.ticket_expected = 0;
|
||||
|
||||
/*
|
||||
* If tickets disabled behave as if no ticket present to permit stateful
|
||||
* If tickets disabled or not supported by the protocol version
|
||||
* (e.g. TLSv1.3) behave as if no ticket present to permit stateful
|
||||
* resumption.
|
||||
*/
|
||||
if ((s->version <= SSL3_VERSION))
|
||||
return 0;
|
||||
if (s->version <= SSL3_VERSION || !tls_use_ticket(s))
|
||||
return TICKET_NONE;
|
||||
|
||||
if (!PACKET_get_net_2(&local_ext, &i)) {
|
||||
retv = 0;
|
||||
goto end;
|
||||
ticketext = &hello->pre_proc_exts[TLSEXT_IDX_session_ticket];
|
||||
if (!ticketext->present)
|
||||
return TICKET_NONE;
|
||||
|
||||
size = PACKET_remaining(&ticketext->data);
|
||||
if (size == 0) {
|
||||
/*
|
||||
* The client will accept a ticket but doesn't currently have
|
||||
* one.
|
||||
*/
|
||||
s->ext.ticket_expected = 1;
|
||||
return TICKET_EMPTY;
|
||||
}
|
||||
while (PACKET_remaining(&local_ext) >= 4) {
|
||||
unsigned int type, size;
|
||||
|
||||
if (!PACKET_get_net_2(&local_ext, &type)
|
||||
|| !PACKET_get_net_2(&local_ext, &size)) {
|
||||
/* Shouldn't ever happen */
|
||||
retv = -1;
|
||||
goto end;
|
||||
}
|
||||
if (PACKET_remaining(&local_ext) < size) {
|
||||
retv = 0;
|
||||
goto end;
|
||||
}
|
||||
if (type == TLSEXT_TYPE_session_ticket && use_ticket) {
|
||||
int r;
|
||||
const unsigned char *etick;
|
||||
|
||||
/* Duplicate extension */
|
||||
if (have_ticket != 0) {
|
||||
retv = -1;
|
||||
goto end;
|
||||
}
|
||||
have_ticket = 1;
|
||||
|
||||
if (size == 0) {
|
||||
/*
|
||||
* The client will accept a ticket but doesn't currently have
|
||||
* one.
|
||||
*/
|
||||
s->tlsext_ticket_expected = 1;
|
||||
retv = 1;
|
||||
continue;
|
||||
}
|
||||
if (s->tls_session_secret_cb) {
|
||||
/*
|
||||
* Indicate that the ticket couldn't be decrypted rather than
|
||||
* generating the session from ticket now, trigger
|
||||
* abbreviated handshake based on external mechanism to
|
||||
* calculate the master secret later.
|
||||
*/
|
||||
retv = 2;
|
||||
continue;
|
||||
}
|
||||
if (!PACKET_get_bytes(&local_ext, &etick, size)) {
|
||||
/* Shouldn't ever happen */
|
||||
retv = -1;
|
||||
goto end;
|
||||
}
|
||||
r = tls_decrypt_ticket(s, etick, size, PACKET_data(session_id),
|
||||
PACKET_remaining(session_id), ret);
|
||||
switch (r) {
|
||||
case 2: /* ticket couldn't be decrypted */
|
||||
s->tlsext_ticket_expected = 1;
|
||||
retv = 2;
|
||||
break;
|
||||
case 3: /* ticket was decrypted */
|
||||
retv = r;
|
||||
break;
|
||||
case 4: /* ticket decrypted but need to renew */
|
||||
s->tlsext_ticket_expected = 1;
|
||||
retv = 3;
|
||||
break;
|
||||
default: /* fatal error */
|
||||
retv = -1;
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
} else {
|
||||
if (type == TLSEXT_TYPE_extended_master_secret)
|
||||
s->s3->flags |= TLS1_FLAGS_RECEIVED_EXTMS;
|
||||
if (!PACKET_forward(&local_ext, size)) {
|
||||
retv = -1;
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
if (s->ext.session_secret_cb) {
|
||||
/*
|
||||
* Indicate that the ticket couldn't be decrypted rather than
|
||||
* generating the session from ticket now, trigger
|
||||
* abbreviated handshake based on external mechanism to
|
||||
* calculate the master secret later.
|
||||
*/
|
||||
return TICKET_NO_DECRYPT;
|
||||
}
|
||||
|
||||
retv = tls_decrypt_ticket(s, PACKET_data(&ticketext->data), size,
|
||||
hello->session_id, hello->session_id_len, ret);
|
||||
switch (retv) {
|
||||
case TICKET_NO_DECRYPT:
|
||||
s->ext.ticket_expected = 1;
|
||||
return TICKET_NO_DECRYPT;
|
||||
|
||||
case TICKET_SUCCESS:
|
||||
return TICKET_SUCCESS;
|
||||
|
||||
case TICKET_SUCCESS_RENEW:
|
||||
s->ext.ticket_expected = 1;
|
||||
return TICKET_SUCCESS;
|
||||
|
||||
default:
|
||||
return TICKET_FATAL_ERR_OTHER;
|
||||
}
|
||||
if (have_ticket == 0)
|
||||
retv = 0;
|
||||
end:
|
||||
return retv;
|
||||
}
|
||||
|
||||
/*-
|
||||
@@ -3093,22 +1267,17 @@ int tls_check_serverhello_tlsext_early(SSL *s, const PACKET *ext,
|
||||
* sesslen: the length of the session ID.
|
||||
* psess: (output) on return, if a ticket was decrypted, then this is set to
|
||||
* point to the resulting session.
|
||||
*
|
||||
* Returns:
|
||||
* -2: fatal error, malloc failure.
|
||||
* -1: fatal error, either from parsing or decrypting the ticket.
|
||||
* 2: the ticket couldn't be decrypted.
|
||||
* 3: a ticket was successfully decrypted and *psess was set.
|
||||
* 4: same as 3, but the ticket needs to be renewed.
|
||||
*/
|
||||
static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
|
||||
int eticklen, const unsigned char *sess_id,
|
||||
int sesslen, SSL_SESSION **psess)
|
||||
TICKET_RETURN tls_decrypt_ticket(SSL *s, const unsigned char *etick,
|
||||
size_t eticklen, const unsigned char *sess_id,
|
||||
size_t sesslen, SSL_SESSION **psess)
|
||||
{
|
||||
SSL_SESSION *sess;
|
||||
unsigned char *sdec;
|
||||
const unsigned char *p;
|
||||
int slen, mlen, renew_ticket = 0, ret = -1;
|
||||
int slen, renew_ticket = 0, declen;
|
||||
TICKET_RETURN ret = TICKET_FATAL_ERR_OTHER;
|
||||
size_t mlen;
|
||||
unsigned char tick_hmac[EVP_MAX_MD_SIZE];
|
||||
HMAC_CTX *hctx = NULL;
|
||||
EVP_CIPHER_CTX *ctx = NULL;
|
||||
@@ -3116,44 +1285,44 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
|
||||
|
||||
/* Need at least keyname + iv */
|
||||
if (eticklen < TLSEXT_KEYNAME_LENGTH + EVP_MAX_IV_LENGTH) {
|
||||
ret = 2;
|
||||
ret = TICKET_NO_DECRYPT;
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* Initialize session ticket encryption and HMAC contexts */
|
||||
hctx = HMAC_CTX_new();
|
||||
if (hctx == NULL)
|
||||
return -2;
|
||||
return TICKET_FATAL_ERR_MALLOC;
|
||||
ctx = EVP_CIPHER_CTX_new();
|
||||
if (ctx == NULL) {
|
||||
ret = -2;
|
||||
ret = TICKET_FATAL_ERR_MALLOC;
|
||||
goto err;
|
||||
}
|
||||
if (tctx->tlsext_ticket_key_cb) {
|
||||
if (tctx->ext.ticket_key_cb) {
|
||||
unsigned char *nctick = (unsigned char *)etick;
|
||||
int rv = tctx->tlsext_ticket_key_cb(s, nctick,
|
||||
nctick + TLSEXT_KEYNAME_LENGTH,
|
||||
ctx, hctx, 0);
|
||||
int rv = tctx->ext.ticket_key_cb(s, nctick,
|
||||
nctick + TLSEXT_KEYNAME_LENGTH,
|
||||
ctx, hctx, 0);
|
||||
if (rv < 0)
|
||||
goto err;
|
||||
if (rv == 0) {
|
||||
ret = 2;
|
||||
ret = TICKET_NO_DECRYPT;
|
||||
goto err;
|
||||
}
|
||||
if (rv == 2)
|
||||
renew_ticket = 1;
|
||||
} else {
|
||||
/* Check key name matches */
|
||||
if (memcmp(etick, tctx->tlsext_tick_key_name,
|
||||
if (memcmp(etick, tctx->ext.tick_key_name,
|
||||
TLSEXT_KEYNAME_LENGTH) != 0) {
|
||||
ret = 2;
|
||||
ret = TICKET_NO_DECRYPT;
|
||||
goto err;
|
||||
}
|
||||
if (HMAC_Init_ex(hctx, tctx->tlsext_tick_hmac_key,
|
||||
sizeof(tctx->tlsext_tick_hmac_key),
|
||||
if (HMAC_Init_ex(hctx, tctx->ext.tick_hmac_key,
|
||||
sizeof(tctx->ext.tick_hmac_key),
|
||||
EVP_sha256(), NULL) <= 0
|
||||
|| EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL,
|
||||
tctx->tlsext_tick_aes_key,
|
||||
tctx->ext.tick_aes_key,
|
||||
etick + TLSEXT_KEYNAME_LENGTH) <= 0) {
|
||||
goto err;
|
||||
}
|
||||
@@ -3163,13 +1332,13 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
|
||||
* checks on ticket.
|
||||
*/
|
||||
mlen = HMAC_size(hctx);
|
||||
if (mlen < 0) {
|
||||
if (mlen == 0) {
|
||||
goto err;
|
||||
}
|
||||
/* Sanity check ticket length: must exceed keyname + IV + HMAC */
|
||||
if (eticklen <=
|
||||
TLSEXT_KEYNAME_LENGTH + EVP_CIPHER_CTX_iv_length(ctx) + mlen) {
|
||||
ret = 2;
|
||||
ret = TICKET_NO_DECRYPT;
|
||||
goto err;
|
||||
}
|
||||
eticklen -= mlen;
|
||||
@@ -3181,24 +1350,25 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
|
||||
HMAC_CTX_free(hctx);
|
||||
if (CRYPTO_memcmp(tick_hmac, etick + eticklen, mlen)) {
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
return 2;
|
||||
return TICKET_NO_DECRYPT;
|
||||
}
|
||||
/* Attempt to decrypt session data */
|
||||
/* Move p after IV to start of encrypted ticket, update length */
|
||||
p = etick + TLSEXT_KEYNAME_LENGTH + EVP_CIPHER_CTX_iv_length(ctx);
|
||||
eticklen -= TLSEXT_KEYNAME_LENGTH + EVP_CIPHER_CTX_iv_length(ctx);
|
||||
sdec = OPENSSL_malloc(eticklen);
|
||||
if (sdec == NULL || EVP_DecryptUpdate(ctx, sdec, &slen, p, eticklen) <= 0) {
|
||||
if (sdec == NULL || EVP_DecryptUpdate(ctx, sdec, &slen, p,
|
||||
(int)eticklen) <= 0) {
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
OPENSSL_free(sdec);
|
||||
return -1;
|
||||
return TICKET_FATAL_ERR_OTHER;
|
||||
}
|
||||
if (EVP_DecryptFinal(ctx, sdec + slen, &mlen) <= 0) {
|
||||
if (EVP_DecryptFinal(ctx, sdec + slen, &declen) <= 0) {
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
OPENSSL_free(sdec);
|
||||
return 2;
|
||||
return TICKET_NO_DECRYPT;
|
||||
}
|
||||
slen += mlen;
|
||||
slen += declen;
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
ctx = NULL;
|
||||
p = sdec;
|
||||
@@ -3210,7 +1380,7 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
|
||||
/* Some additional consistency checks */
|
||||
if (slen != 0 || sess->session_id_length != 0) {
|
||||
SSL_SESSION_free(sess);
|
||||
return 2;
|
||||
return TICKET_NO_DECRYPT;
|
||||
}
|
||||
/*
|
||||
* The session ID, if non-empty, is used by some clients to detect
|
||||
@@ -3223,201 +1393,50 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
|
||||
sess->session_id_length = sesslen;
|
||||
*psess = sess;
|
||||
if (renew_ticket)
|
||||
return 4;
|
||||
return TICKET_SUCCESS_RENEW;
|
||||
else
|
||||
return 3;
|
||||
return TICKET_SUCCESS;
|
||||
}
|
||||
ERR_clear_error();
|
||||
/*
|
||||
* For session parse failure, indicate that we need to send a new ticket.
|
||||
*/
|
||||
return 2;
|
||||
return TICKET_NO_DECRYPT;
|
||||
err:
|
||||
EVP_CIPHER_CTX_free(ctx);
|
||||
HMAC_CTX_free(hctx);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Tables to translate from NIDs to TLS v1.2 ids */
|
||||
|
||||
typedef struct {
|
||||
int nid;
|
||||
int id;
|
||||
} tls12_lookup;
|
||||
|
||||
static const tls12_lookup tls12_md[] = {
|
||||
{NID_md5, TLSEXT_hash_md5},
|
||||
{NID_sha1, TLSEXT_hash_sha1},
|
||||
{NID_sha224, TLSEXT_hash_sha224},
|
||||
{NID_sha256, TLSEXT_hash_sha256},
|
||||
{NID_sha384, TLSEXT_hash_sha384},
|
||||
{NID_sha512, TLSEXT_hash_sha512},
|
||||
{NID_id_GostR3411_94, TLSEXT_hash_gostr3411},
|
||||
{NID_id_GostR3411_2012_256, TLSEXT_hash_gostr34112012_256},
|
||||
{NID_id_GostR3411_2012_512, TLSEXT_hash_gostr34112012_512},
|
||||
};
|
||||
|
||||
static const tls12_lookup tls12_sig[] = {
|
||||
{EVP_PKEY_RSA, TLSEXT_signature_rsa},
|
||||
{EVP_PKEY_DSA, TLSEXT_signature_dsa},
|
||||
{EVP_PKEY_EC, TLSEXT_signature_ecdsa},
|
||||
{NID_id_GostR3410_2001, TLSEXT_signature_gostr34102001},
|
||||
{NID_id_GostR3410_2012_256, TLSEXT_signature_gostr34102012_256},
|
||||
{NID_id_GostR3410_2012_512, TLSEXT_signature_gostr34102012_512}
|
||||
};
|
||||
|
||||
static int tls12_find_id(int nid, const tls12_lookup *table, size_t tlen)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < tlen; i++) {
|
||||
if (table[i].nid == nid)
|
||||
return table[i].id;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int tls12_find_nid(int id, const tls12_lookup *table, size_t tlen)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < tlen; i++) {
|
||||
if ((table[i].id) == id)
|
||||
return table[i].nid;
|
||||
}
|
||||
return NID_undef;
|
||||
}
|
||||
|
||||
int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, const EVP_MD *md)
|
||||
{
|
||||
int sig_id, md_id;
|
||||
if (!md)
|
||||
return 0;
|
||||
md_id = tls12_find_id(EVP_MD_type(md), tls12_md, OSSL_NELEM(tls12_md));
|
||||
if (md_id == -1)
|
||||
return 0;
|
||||
sig_id = tls12_get_sigid(pk);
|
||||
if (sig_id == -1)
|
||||
return 0;
|
||||
p[0] = (unsigned char)md_id;
|
||||
p[1] = (unsigned char)sig_id;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int tls12_get_sigid(const EVP_PKEY *pk)
|
||||
{
|
||||
return tls12_find_id(EVP_PKEY_id(pk), tls12_sig, OSSL_NELEM(tls12_sig));
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
int nid;
|
||||
int secbits;
|
||||
int md_idx;
|
||||
unsigned char tlsext_hash;
|
||||
} tls12_hash_info;
|
||||
|
||||
static const tls12_hash_info tls12_md_info[] = {
|
||||
{NID_md5, 64, SSL_MD_MD5_IDX, TLSEXT_hash_md5},
|
||||
{NID_sha1, 80, SSL_MD_SHA1_IDX, TLSEXT_hash_sha1},
|
||||
{NID_sha224, 112, SSL_MD_SHA224_IDX, TLSEXT_hash_sha224},
|
||||
{NID_sha256, 128, SSL_MD_SHA256_IDX, TLSEXT_hash_sha256},
|
||||
{NID_sha384, 192, SSL_MD_SHA384_IDX, TLSEXT_hash_sha384},
|
||||
{NID_sha512, 256, SSL_MD_SHA512_IDX, TLSEXT_hash_sha512},
|
||||
{NID_id_GostR3411_94, 128, SSL_MD_GOST94_IDX, TLSEXT_hash_gostr3411},
|
||||
{NID_id_GostR3411_2012_256, 128, SSL_MD_GOST12_256_IDX,
|
||||
TLSEXT_hash_gostr34112012_256},
|
||||
{NID_id_GostR3411_2012_512, 256, SSL_MD_GOST12_512_IDX,
|
||||
TLSEXT_hash_gostr34112012_512},
|
||||
};
|
||||
|
||||
static const tls12_hash_info *tls12_get_hash_info(unsigned char hash_alg)
|
||||
{
|
||||
unsigned int i;
|
||||
if (hash_alg == 0)
|
||||
return NULL;
|
||||
|
||||
for (i = 0; i < OSSL_NELEM(tls12_md_info); i++) {
|
||||
if (tls12_md_info[i].tlsext_hash == hash_alg)
|
||||
return tls12_md_info + i;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const EVP_MD *tls12_get_hash(unsigned char hash_alg)
|
||||
{
|
||||
const tls12_hash_info *inf;
|
||||
if (hash_alg == TLSEXT_hash_md5 && FIPS_mode())
|
||||
return NULL;
|
||||
inf = tls12_get_hash_info(hash_alg);
|
||||
if (!inf)
|
||||
return NULL;
|
||||
return ssl_md(inf->md_idx);
|
||||
}
|
||||
|
||||
static int tls12_get_pkey_idx(unsigned char sig_alg)
|
||||
{
|
||||
switch (sig_alg) {
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
case TLSEXT_signature_rsa:
|
||||
return SSL_PKEY_RSA_SIGN;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
case TLSEXT_signature_dsa:
|
||||
return SSL_PKEY_DSA_SIGN;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
case TLSEXT_signature_ecdsa:
|
||||
return SSL_PKEY_ECC;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_GOST
|
||||
case TLSEXT_signature_gostr34102001:
|
||||
return SSL_PKEY_GOST01;
|
||||
|
||||
case TLSEXT_signature_gostr34102012_256:
|
||||
return SSL_PKEY_GOST12_256;
|
||||
|
||||
case TLSEXT_signature_gostr34102012_512:
|
||||
return SSL_PKEY_GOST12_512;
|
||||
#endif
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Convert TLS 1.2 signature algorithm extension values into NIDs */
|
||||
static void tls1_lookup_sigalg(int *phash_nid, int *psign_nid,
|
||||
int *psignhash_nid, const unsigned char *data)
|
||||
{
|
||||
int sign_nid = NID_undef, hash_nid = NID_undef;
|
||||
if (!phash_nid && !psign_nid && !psignhash_nid)
|
||||
return;
|
||||
if (phash_nid || psignhash_nid) {
|
||||
hash_nid = tls12_find_nid(data[0], tls12_md, OSSL_NELEM(tls12_md));
|
||||
if (phash_nid)
|
||||
*phash_nid = hash_nid;
|
||||
}
|
||||
if (psign_nid || psignhash_nid) {
|
||||
sign_nid = tls12_find_nid(data[1], tls12_sig, OSSL_NELEM(tls12_sig));
|
||||
if (psign_nid)
|
||||
*psign_nid = sign_nid;
|
||||
}
|
||||
if (psignhash_nid) {
|
||||
if (sign_nid == NID_undef || hash_nid == NID_undef
|
||||
|| OBJ_find_sigid_by_algs(psignhash_nid, hash_nid, sign_nid) <= 0)
|
||||
*psignhash_nid = NID_undef;
|
||||
}
|
||||
}
|
||||
|
||||
/* Check to see if a signature algorithm is allowed */
|
||||
static int tls12_sigalg_allowed(SSL *s, int op, const unsigned char *ptmp)
|
||||
static int tls12_sigalg_allowed(SSL *s, int op, const SIGALG_LOOKUP *lu)
|
||||
{
|
||||
/* See if we have an entry in the hash table and it is enabled */
|
||||
const tls12_hash_info *hinf = tls12_get_hash_info(ptmp[0]);
|
||||
if (hinf == NULL || ssl_md(hinf->md_idx) == NULL)
|
||||
unsigned char sigalgstr[2];
|
||||
int secbits;
|
||||
|
||||
/* See if sigalgs is recognised and if hash is enabled */
|
||||
if (!tls1_lookup_md(lu, NULL))
|
||||
return 0;
|
||||
/* DSA is not allowed in TLS 1.3 */
|
||||
if (SSL_IS_TLS13(s) && lu->sig == EVP_PKEY_DSA)
|
||||
return 0;
|
||||
/* TODO(OpenSSL1.2) fully axe DSA/etc. in ClientHello per TLS 1.3 spec */
|
||||
if (!s->server && !SSL_IS_DTLS(s) && s->s3->tmp.min_ver >= TLS1_3_VERSION
|
||||
&& (lu->sig == EVP_PKEY_DSA || lu->hash_idx == SSL_MD_SHA1_IDX
|
||||
|| lu->hash_idx == SSL_MD_MD5_IDX
|
||||
|| lu->hash_idx == SSL_MD_SHA224_IDX))
|
||||
return 0;
|
||||
/* See if public key algorithm allowed */
|
||||
if (tls12_get_pkey_idx(ptmp[1]) == -1)
|
||||
if (ssl_cert_is_disabled(lu->sig_idx))
|
||||
return 0;
|
||||
if (lu->hash == NID_undef)
|
||||
return 1;
|
||||
/* Security bits: half digest bits */
|
||||
secbits = EVP_MD_size(ssl_md(lu->hash_idx)) * 4;
|
||||
/* Finally see if security callback allows it */
|
||||
return ssl_security(s, op, hinf->secbits, hinf->nid, (void *)ptmp);
|
||||
sigalgstr[0] = (lu->sigalg >> 8) & 0xff;
|
||||
sigalgstr[1] = lu->sigalg & 0xff;
|
||||
return ssl_security(s, op, secbits, lu->hash, (void *)sigalgstr);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -3428,81 +1447,79 @@ static int tls12_sigalg_allowed(SSL *s, int op, const unsigned char *ptmp)
|
||||
|
||||
void ssl_set_sig_mask(uint32_t *pmask_a, SSL *s, int op)
|
||||
{
|
||||
const unsigned char *sigalgs;
|
||||
const uint16_t *sigalgs;
|
||||
size_t i, sigalgslen;
|
||||
int have_rsa = 0, have_dsa = 0, have_ecdsa = 0;
|
||||
uint32_t disabled_mask = SSL_aRSA | SSL_aDSS | SSL_aECDSA;
|
||||
/*
|
||||
* Now go through all signature algorithms seeing if we support any for
|
||||
* RSA, DSA, ECDSA. Do this for all versions not just TLS 1.2. To keep
|
||||
* down calls to security callback only check if we have to.
|
||||
* Go through all signature algorithms seeing if we support any
|
||||
* in disabled_mask.
|
||||
*/
|
||||
sigalgslen = tls12_get_psigalgs(s, 1, &sigalgs);
|
||||
for (i = 0; i < sigalgslen; i += 2, sigalgs += 2) {
|
||||
switch (sigalgs[1]) {
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
case TLSEXT_signature_rsa:
|
||||
if (!have_rsa && tls12_sigalg_allowed(s, op, sigalgs))
|
||||
have_rsa = 1;
|
||||
break;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
case TLSEXT_signature_dsa:
|
||||
if (!have_dsa && tls12_sigalg_allowed(s, op, sigalgs))
|
||||
have_dsa = 1;
|
||||
break;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
case TLSEXT_signature_ecdsa:
|
||||
if (!have_ecdsa && tls12_sigalg_allowed(s, op, sigalgs))
|
||||
have_ecdsa = 1;
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
for (i = 0; i < sigalgslen; i++, sigalgs++) {
|
||||
const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(*sigalgs);
|
||||
const SSL_CERT_LOOKUP *clu;
|
||||
|
||||
if (lu == NULL)
|
||||
continue;
|
||||
|
||||
clu = ssl_cert_lookup_by_idx(lu->sig_idx);
|
||||
if (clu == NULL)
|
||||
continue;
|
||||
|
||||
/* If algorithm is disabled see if we can enable it */
|
||||
if ((clu->amask & disabled_mask) != 0
|
||||
&& tls12_sigalg_allowed(s, op, lu))
|
||||
disabled_mask &= ~clu->amask;
|
||||
}
|
||||
if (!have_rsa)
|
||||
*pmask_a |= SSL_aRSA;
|
||||
if (!have_dsa)
|
||||
*pmask_a |= SSL_aDSS;
|
||||
if (!have_ecdsa)
|
||||
*pmask_a |= SSL_aECDSA;
|
||||
*pmask_a |= disabled_mask;
|
||||
}
|
||||
|
||||
size_t tls12_copy_sigalgs(SSL *s, unsigned char *out,
|
||||
const unsigned char *psig, size_t psiglen)
|
||||
int tls12_copy_sigalgs(SSL *s, WPACKET *pkt,
|
||||
const uint16_t *psig, size_t psiglen)
|
||||
{
|
||||
unsigned char *tmpout = out;
|
||||
size_t i;
|
||||
for (i = 0; i < psiglen; i += 2, psig += 2) {
|
||||
if (tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SUPPORTED, psig)) {
|
||||
*tmpout++ = psig[0];
|
||||
*tmpout++ = psig[1];
|
||||
}
|
||||
int rv = 0;
|
||||
|
||||
for (i = 0; i < psiglen; i++, psig++) {
|
||||
const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(*psig);
|
||||
|
||||
if (!tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SUPPORTED, lu))
|
||||
continue;
|
||||
if (!WPACKET_put_bytes_u16(pkt, *psig))
|
||||
return 0;
|
||||
/*
|
||||
* If TLS 1.3 must have at least one valid TLS 1.3 message
|
||||
* signing algorithm: i.e. neither RSA nor SHA1/SHA224
|
||||
*/
|
||||
if (rv == 0 && (!SSL_IS_TLS13(s)
|
||||
|| (lu->sig != EVP_PKEY_RSA
|
||||
&& lu->hash != NID_sha1
|
||||
&& lu->hash != NID_sha224)))
|
||||
rv = 1;
|
||||
}
|
||||
return tmpout - out;
|
||||
if (rv == 0)
|
||||
SSLerr(SSL_F_TLS12_COPY_SIGALGS, SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* Given preference and allowed sigalgs set shared sigalgs */
|
||||
static int tls12_shared_sigalgs(SSL *s, TLS_SIGALGS *shsig,
|
||||
const unsigned char *pref, size_t preflen,
|
||||
const unsigned char *allow, size_t allowlen)
|
||||
static size_t tls12_shared_sigalgs(SSL *s, const SIGALG_LOOKUP **shsig,
|
||||
const uint16_t *pref, size_t preflen,
|
||||
const uint16_t *allow, size_t allowlen)
|
||||
{
|
||||
const unsigned char *ptmp, *atmp;
|
||||
const uint16_t *ptmp, *atmp;
|
||||
size_t i, j, nmatch = 0;
|
||||
for (i = 0, ptmp = pref; i < preflen; i += 2, ptmp += 2) {
|
||||
for (i = 0, ptmp = pref; i < preflen; i++, ptmp++) {
|
||||
const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(*ptmp);
|
||||
|
||||
/* Skip disabled hashes or signature algorithms */
|
||||
if (!tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SHARED, ptmp))
|
||||
if (!tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SHARED, lu))
|
||||
continue;
|
||||
for (j = 0, atmp = allow; j < allowlen; j += 2, atmp += 2) {
|
||||
if (ptmp[0] == atmp[0] && ptmp[1] == atmp[1]) {
|
||||
for (j = 0, atmp = allow; j < allowlen; j++, atmp++) {
|
||||
if (*ptmp == *atmp) {
|
||||
nmatch++;
|
||||
if (shsig) {
|
||||
shsig->rhash = ptmp[0];
|
||||
shsig->rsign = ptmp[1];
|
||||
tls1_lookup_sigalg(&shsig->hash_nid,
|
||||
&shsig->sign_nid,
|
||||
&shsig->signandhash_nid, ptmp);
|
||||
shsig++;
|
||||
}
|
||||
if (shsig)
|
||||
*shsig++ = lu;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -3513,10 +1530,10 @@ static int tls12_shared_sigalgs(SSL *s, TLS_SIGALGS *shsig,
|
||||
/* Set shared signature algorithms for SSL structures */
|
||||
static int tls1_set_shared_sigalgs(SSL *s)
|
||||
{
|
||||
const unsigned char *pref, *allow, *conf;
|
||||
const uint16_t *pref, *allow, *conf;
|
||||
size_t preflen, allowlen, conflen;
|
||||
size_t nmatch;
|
||||
TLS_SIGALGS *salgs = NULL;
|
||||
const SIGALG_LOOKUP **salgs = NULL;
|
||||
CERT *c = s->cert;
|
||||
unsigned int is_suiteb = tls1_suiteb(s);
|
||||
|
||||
@@ -3545,7 +1562,7 @@ static int tls1_set_shared_sigalgs(SSL *s)
|
||||
}
|
||||
nmatch = tls12_shared_sigalgs(s, NULL, pref, preflen, allow, allowlen);
|
||||
if (nmatch) {
|
||||
salgs = OPENSSL_malloc(nmatch * sizeof(TLS_SIGALGS));
|
||||
salgs = OPENSSL_malloc(nmatch * sizeof(*salgs));
|
||||
if (salgs == NULL)
|
||||
return 0;
|
||||
nmatch = tls12_shared_sigalgs(s, salgs, pref, preflen, allow, allowlen);
|
||||
@@ -3557,86 +1574,80 @@ static int tls1_set_shared_sigalgs(SSL *s)
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Set preferred digest for each key type */
|
||||
|
||||
int tls1_save_sigalgs(SSL *s, const unsigned char *data, int dsize)
|
||||
int tls1_save_u16(PACKET *pkt, uint16_t **pdest, size_t *pdestlen)
|
||||
{
|
||||
unsigned int stmp;
|
||||
size_t size, i;
|
||||
uint16_t *buf;
|
||||
|
||||
size = PACKET_remaining(pkt);
|
||||
|
||||
/* Invalid data length */
|
||||
if (size == 0 || (size & 1) != 0)
|
||||
return 0;
|
||||
|
||||
size >>= 1;
|
||||
|
||||
buf = OPENSSL_malloc(size * sizeof(*buf));
|
||||
if (buf == NULL)
|
||||
return 0;
|
||||
for (i = 0; i < size && PACKET_get_net_2(pkt, &stmp); i++)
|
||||
buf[i] = stmp;
|
||||
|
||||
if (i != size) {
|
||||
OPENSSL_free(buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
OPENSSL_free(*pdest);
|
||||
*pdest = buf;
|
||||
*pdestlen = size;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int tls1_save_sigalgs(SSL *s, PACKET *pkt, int cert)
|
||||
{
|
||||
CERT *c = s->cert;
|
||||
/* Extension ignored for inappropriate versions */
|
||||
if (!SSL_USE_SIGALGS(s))
|
||||
return 1;
|
||||
/* Should never happen */
|
||||
if (!c)
|
||||
if (s->cert == NULL)
|
||||
return 0;
|
||||
|
||||
OPENSSL_free(s->s3->tmp.peer_sigalgs);
|
||||
s->s3->tmp.peer_sigalgs = OPENSSL_malloc(dsize);
|
||||
if (s->s3->tmp.peer_sigalgs == NULL)
|
||||
return 0;
|
||||
s->s3->tmp.peer_sigalgslen = dsize;
|
||||
memcpy(s->s3->tmp.peer_sigalgs, data, dsize);
|
||||
return 1;
|
||||
if (cert)
|
||||
return tls1_save_u16(pkt, &s->s3->tmp.peer_cert_sigalgs,
|
||||
&s->s3->tmp.peer_cert_sigalgslen);
|
||||
else
|
||||
return tls1_save_u16(pkt, &s->s3->tmp.peer_sigalgs,
|
||||
&s->s3->tmp.peer_sigalgslen);
|
||||
|
||||
}
|
||||
|
||||
/* Set preferred digest for each key type */
|
||||
|
||||
int tls1_process_sigalgs(SSL *s)
|
||||
{
|
||||
int idx;
|
||||
size_t i;
|
||||
const EVP_MD *md;
|
||||
const EVP_MD **pmd = s->s3->tmp.md;
|
||||
uint32_t *pvalid = s->s3->tmp.valid_flags;
|
||||
CERT *c = s->cert;
|
||||
TLS_SIGALGS *sigptr;
|
||||
|
||||
if (!tls1_set_shared_sigalgs(s))
|
||||
return 0;
|
||||
|
||||
for (i = 0, sigptr = c->shared_sigalgs;
|
||||
i < c->shared_sigalgslen; i++, sigptr++) {
|
||||
idx = tls12_get_pkey_idx(sigptr->rsign);
|
||||
if (idx > 0 && pmd[idx] == NULL) {
|
||||
md = tls12_get_hash(sigptr->rhash);
|
||||
pmd[idx] = md;
|
||||
pvalid[idx] = CERT_PKEY_EXPLICIT_SIGN;
|
||||
if (idx == SSL_PKEY_RSA_SIGN) {
|
||||
pvalid[SSL_PKEY_RSA_ENC] = CERT_PKEY_EXPLICIT_SIGN;
|
||||
pmd[SSL_PKEY_RSA_ENC] = md;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < SSL_PKEY_NUM; i++)
|
||||
pvalid[i] = 0;
|
||||
|
||||
}
|
||||
/*
|
||||
* In strict mode leave unset digests as NULL to indicate we can't use
|
||||
* the certificate for signing.
|
||||
*/
|
||||
if (!(s->cert->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT)) {
|
||||
/*
|
||||
* Set any remaining keys to default values. NOTE: if alg is not
|
||||
* supported it stays as NULL.
|
||||
*/
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
if (pmd[SSL_PKEY_DSA_SIGN] == NULL)
|
||||
pmd[SSL_PKEY_DSA_SIGN] = EVP_sha1();
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
if (pmd[SSL_PKEY_RSA_SIGN] == NULL) {
|
||||
pmd[SSL_PKEY_RSA_SIGN] = EVP_sha1();
|
||||
pmd[SSL_PKEY_RSA_ENC] = EVP_sha1();
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
if (pmd[SSL_PKEY_ECC] == NULL)
|
||||
pmd[SSL_PKEY_ECC] = EVP_sha1();
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_GOST
|
||||
if (pmd[SSL_PKEY_GOST01] == NULL)
|
||||
pmd[SSL_PKEY_GOST01] = EVP_get_digestbynid(NID_id_GostR3411_94);
|
||||
if (pmd[SSL_PKEY_GOST12_256] == NULL)
|
||||
pmd[SSL_PKEY_GOST12_256] =
|
||||
EVP_get_digestbynid(NID_id_GostR3411_2012_256);
|
||||
if (pmd[SSL_PKEY_GOST12_512] == NULL)
|
||||
pmd[SSL_PKEY_GOST12_512] =
|
||||
EVP_get_digestbynid(NID_id_GostR3411_2012_512);
|
||||
#endif
|
||||
for (i = 0; i < c->shared_sigalgslen; i++) {
|
||||
const SIGALG_LOOKUP *sigptr = c->shared_sigalgs[i];
|
||||
int idx = sigptr->sig_idx;
|
||||
|
||||
/* Ignore PKCS1 based sig algs in TLSv1.3 */
|
||||
if (SSL_IS_TLS13(s) && sigptr->sig == EVP_PKEY_RSA)
|
||||
continue;
|
||||
/* If not disabled indicate we can explicitly sign */
|
||||
if (pvalid[idx] == 0 && !ssl_cert_is_disabled(idx))
|
||||
pvalid[idx] = CERT_PKEY_EXPLICIT_SIGN | CERT_PKEY_SIGN;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -3645,55 +1656,70 @@ int SSL_get_sigalgs(SSL *s, int idx,
|
||||
int *psign, int *phash, int *psignhash,
|
||||
unsigned char *rsig, unsigned char *rhash)
|
||||
{
|
||||
const unsigned char *psig = s->s3->tmp.peer_sigalgs;
|
||||
if (psig == NULL)
|
||||
uint16_t *psig = s->s3->tmp.peer_sigalgs;
|
||||
size_t numsigalgs = s->s3->tmp.peer_sigalgslen;
|
||||
if (psig == NULL || numsigalgs > INT_MAX)
|
||||
return 0;
|
||||
if (idx >= 0) {
|
||||
idx <<= 1;
|
||||
if (idx >= (int)s->s3->tmp.peer_sigalgslen)
|
||||
const SIGALG_LOOKUP *lu;
|
||||
|
||||
if (idx >= (int)numsigalgs)
|
||||
return 0;
|
||||
psig += idx;
|
||||
if (rhash)
|
||||
*rhash = psig[0];
|
||||
if (rsig)
|
||||
*rsig = psig[1];
|
||||
tls1_lookup_sigalg(phash, psign, psignhash, psig);
|
||||
if (rhash != NULL)
|
||||
*rhash = (unsigned char)((*psig >> 8) & 0xff);
|
||||
if (rsig != NULL)
|
||||
*rsig = (unsigned char)(*psig & 0xff);
|
||||
lu = tls1_lookup_sigalg(*psig);
|
||||
if (psign != NULL)
|
||||
*psign = lu != NULL ? lu->sig : NID_undef;
|
||||
if (phash != NULL)
|
||||
*phash = lu != NULL ? lu->hash : NID_undef;
|
||||
if (psignhash != NULL)
|
||||
*psignhash = lu != NULL ? lu->sigandhash : NID_undef;
|
||||
}
|
||||
return s->s3->tmp.peer_sigalgslen / 2;
|
||||
return (int)numsigalgs;
|
||||
}
|
||||
|
||||
int SSL_get_shared_sigalgs(SSL *s, int idx,
|
||||
int *psign, int *phash, int *psignhash,
|
||||
unsigned char *rsig, unsigned char *rhash)
|
||||
{
|
||||
TLS_SIGALGS *shsigalgs = s->cert->shared_sigalgs;
|
||||
if (!shsigalgs || idx >= (int)s->cert->shared_sigalgslen)
|
||||
const SIGALG_LOOKUP *shsigalgs;
|
||||
if (s->cert->shared_sigalgs == NULL
|
||||
|| idx < 0
|
||||
|| idx >= (int)s->cert->shared_sigalgslen
|
||||
|| s->cert->shared_sigalgslen > INT_MAX)
|
||||
return 0;
|
||||
shsigalgs += idx;
|
||||
if (phash)
|
||||
*phash = shsigalgs->hash_nid;
|
||||
if (psign)
|
||||
*psign = shsigalgs->sign_nid;
|
||||
if (psignhash)
|
||||
*psignhash = shsigalgs->signandhash_nid;
|
||||
if (rsig)
|
||||
*rsig = shsigalgs->rsign;
|
||||
if (rhash)
|
||||
*rhash = shsigalgs->rhash;
|
||||
return s->cert->shared_sigalgslen;
|
||||
shsigalgs = s->cert->shared_sigalgs[idx];
|
||||
if (phash != NULL)
|
||||
*phash = shsigalgs->hash;
|
||||
if (psign != NULL)
|
||||
*psign = shsigalgs->sig;
|
||||
if (psignhash != NULL)
|
||||
*psignhash = shsigalgs->sigandhash;
|
||||
if (rsig != NULL)
|
||||
*rsig = (unsigned char)(shsigalgs->sigalg & 0xff);
|
||||
if (rhash != NULL)
|
||||
*rhash = (unsigned char)((shsigalgs->sigalg >> 8) & 0xff);
|
||||
return (int)s->cert->shared_sigalgslen;
|
||||
}
|
||||
|
||||
#define MAX_SIGALGLEN (TLSEXT_hash_num * TLSEXT_signature_num * 2)
|
||||
/* Maximum possible number of unique entries in sigalgs array */
|
||||
#define TLS_MAX_SIGALGCNT (OSSL_NELEM(sigalg_lookup_tbl) * 2)
|
||||
|
||||
typedef struct {
|
||||
size_t sigalgcnt;
|
||||
int sigalgs[MAX_SIGALGLEN];
|
||||
/* TLSEXT_SIGALG_XXX values */
|
||||
uint16_t sigalgs[TLS_MAX_SIGALGCNT];
|
||||
} sig_cb_st;
|
||||
|
||||
static void get_sigorhash(int *psig, int *phash, const char *str)
|
||||
{
|
||||
if (strcmp(str, "RSA") == 0) {
|
||||
*psig = EVP_PKEY_RSA;
|
||||
} else if (strcmp(str, "RSA-PSS") == 0 || strcmp(str, "PSS") == 0) {
|
||||
*psig = EVP_PKEY_RSA_PSS;
|
||||
} else if (strcmp(str, "DSA") == 0) {
|
||||
*psig = EVP_PKEY_DSA;
|
||||
} else if (strcmp(str, "ECDSA") == 0) {
|
||||
@@ -3704,41 +1730,71 @@ static void get_sigorhash(int *psig, int *phash, const char *str)
|
||||
*phash = OBJ_ln2nid(str);
|
||||
}
|
||||
}
|
||||
/* Maximum length of a signature algorithm string component */
|
||||
#define TLS_MAX_SIGSTRING_LEN 40
|
||||
|
||||
static int sig_cb(const char *elem, int len, void *arg)
|
||||
{
|
||||
sig_cb_st *sarg = arg;
|
||||
size_t i;
|
||||
char etmp[20], *p;
|
||||
const SIGALG_LOOKUP *s;
|
||||
char etmp[TLS_MAX_SIGSTRING_LEN], *p;
|
||||
int sig_alg = NID_undef, hash_alg = NID_undef;
|
||||
if (elem == NULL)
|
||||
return 0;
|
||||
if (sarg->sigalgcnt == MAX_SIGALGLEN)
|
||||
if (sarg->sigalgcnt == TLS_MAX_SIGALGCNT)
|
||||
return 0;
|
||||
if (len > (int)(sizeof(etmp) - 1))
|
||||
return 0;
|
||||
memcpy(etmp, elem, len);
|
||||
etmp[len] = 0;
|
||||
p = strchr(etmp, '+');
|
||||
if (!p)
|
||||
return 0;
|
||||
*p = 0;
|
||||
p++;
|
||||
if (!*p)
|
||||
return 0;
|
||||
|
||||
get_sigorhash(&sig_alg, &hash_alg, etmp);
|
||||
get_sigorhash(&sig_alg, &hash_alg, p);
|
||||
|
||||
if (sig_alg == NID_undef || hash_alg == NID_undef)
|
||||
return 0;
|
||||
|
||||
for (i = 0; i < sarg->sigalgcnt; i += 2) {
|
||||
if (sarg->sigalgs[i] == sig_alg && sarg->sigalgs[i + 1] == hash_alg)
|
||||
/*
|
||||
* We only allow SignatureSchemes listed in the sigalg_lookup_tbl;
|
||||
* if there's no '+' in the provided name, look for the new-style combined
|
||||
* name. If not, match both sig+hash to find the needed SIGALG_LOOKUP.
|
||||
* Just sig+hash is not unique since TLS 1.3 adds rsa_pss_pss_* and
|
||||
* rsa_pss_rsae_* that differ only by public key OID; in such cases
|
||||
* we will pick the _rsae_ variant, by virtue of them appearing earlier
|
||||
* in the table.
|
||||
*/
|
||||
if (p == NULL) {
|
||||
for (i = 0, s = sigalg_lookup_tbl; i < OSSL_NELEM(sigalg_lookup_tbl);
|
||||
i++, s++) {
|
||||
if (s->name != NULL && strcmp(etmp, s->name) == 0) {
|
||||
sarg->sigalgs[sarg->sigalgcnt++] = s->sigalg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == OSSL_NELEM(sigalg_lookup_tbl))
|
||||
return 0;
|
||||
} else {
|
||||
*p = 0;
|
||||
p++;
|
||||
if (*p == 0)
|
||||
return 0;
|
||||
get_sigorhash(&sig_alg, &hash_alg, etmp);
|
||||
get_sigorhash(&sig_alg, &hash_alg, p);
|
||||
if (sig_alg == NID_undef || hash_alg == NID_undef)
|
||||
return 0;
|
||||
for (i = 0, s = sigalg_lookup_tbl; i < OSSL_NELEM(sigalg_lookup_tbl);
|
||||
i++, s++) {
|
||||
if (s->hash == hash_alg && s->sig == sig_alg) {
|
||||
sarg->sigalgs[sarg->sigalgcnt++] = s->sigalg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == OSSL_NELEM(sigalg_lookup_tbl))
|
||||
return 0;
|
||||
}
|
||||
sarg->sigalgs[sarg->sigalgcnt++] = hash_alg;
|
||||
sarg->sigalgs[sarg->sigalgcnt++] = sig_alg;
|
||||
|
||||
/* Reject duplicates */
|
||||
for (i = 0; i < sarg->sigalgcnt - 1; i++) {
|
||||
if (sarg->sigalgs[i] == sarg->sigalgs[sarg->sigalgcnt - 1]) {
|
||||
sarg->sigalgcnt--;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -3754,28 +1810,18 @@ int tls1_set_sigalgs_list(CERT *c, const char *str, int client)
|
||||
return 0;
|
||||
if (c == NULL)
|
||||
return 1;
|
||||
return tls1_set_sigalgs(c, sig.sigalgs, sig.sigalgcnt, client);
|
||||
return tls1_set_raw_sigalgs(c, sig.sigalgs, sig.sigalgcnt, client);
|
||||
}
|
||||
|
||||
int tls1_set_sigalgs(CERT *c, const int *psig_nids, size_t salglen, int client)
|
||||
int tls1_set_raw_sigalgs(CERT *c, const uint16_t *psigs, size_t salglen,
|
||||
int client)
|
||||
{
|
||||
unsigned char *sigalgs, *sptr;
|
||||
int rhash, rsign;
|
||||
size_t i;
|
||||
if (salglen & 1)
|
||||
return 0;
|
||||
sigalgs = OPENSSL_malloc(salglen);
|
||||
uint16_t *sigalgs;
|
||||
|
||||
sigalgs = OPENSSL_malloc(salglen * sizeof(*sigalgs));
|
||||
if (sigalgs == NULL)
|
||||
return 0;
|
||||
for (i = 0, sptr = sigalgs; i < salglen; i += 2) {
|
||||
rhash = tls12_find_id(*psig_nids++, tls12_md, OSSL_NELEM(tls12_md));
|
||||
rsign = tls12_find_id(*psig_nids++, tls12_sig, OSSL_NELEM(tls12_sig));
|
||||
|
||||
if (rhash == -1 || rsign == -1)
|
||||
goto err;
|
||||
*sptr++ = rhash;
|
||||
*sptr++ = rsign;
|
||||
}
|
||||
memcpy(sigalgs, psigs, salglen * sizeof(*sigalgs));
|
||||
|
||||
if (client) {
|
||||
OPENSSL_free(c->client_sigalgs);
|
||||
@@ -3787,6 +1833,47 @@ int tls1_set_sigalgs(CERT *c, const int *psig_nids, size_t salglen, int client)
|
||||
c->conf_sigalgslen = salglen;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int tls1_set_sigalgs(CERT *c, const int *psig_nids, size_t salglen, int client)
|
||||
{
|
||||
uint16_t *sigalgs, *sptr;
|
||||
size_t i;
|
||||
|
||||
if (salglen & 1)
|
||||
return 0;
|
||||
sigalgs = OPENSSL_malloc((salglen / 2) * sizeof(*sigalgs));
|
||||
if (sigalgs == NULL)
|
||||
return 0;
|
||||
for (i = 0, sptr = sigalgs; i < salglen; i += 2) {
|
||||
size_t j;
|
||||
const SIGALG_LOOKUP *curr;
|
||||
int md_id = *psig_nids++;
|
||||
int sig_id = *psig_nids++;
|
||||
|
||||
for (j = 0, curr = sigalg_lookup_tbl; j < OSSL_NELEM(sigalg_lookup_tbl);
|
||||
j++, curr++) {
|
||||
if (curr->hash == md_id && curr->sig == sig_id) {
|
||||
*sptr++ = curr->sigalg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (j == OSSL_NELEM(sigalg_lookup_tbl))
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (client) {
|
||||
OPENSSL_free(c->client_sigalgs);
|
||||
c->client_sigalgs = sigalgs;
|
||||
c->client_sigalgslen = salglen / 2;
|
||||
} else {
|
||||
OPENSSL_free(c->conf_sigalgs);
|
||||
c->conf_sigalgs = sigalgs;
|
||||
c->conf_sigalgslen = salglen / 2;
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
||||
err:
|
||||
@@ -3804,7 +1891,7 @@ static int tls1_check_sig_alg(CERT *c, X509 *x, int default_nid)
|
||||
if (default_nid)
|
||||
return sig_nid == default_nid ? 1 : 0;
|
||||
for (i = 0; i < c->shared_sigalgslen; i++)
|
||||
if (sig_nid == c->shared_sigalgs[i].signandhash_nid)
|
||||
if (sig_nid == c->shared_sigalgs[i]->sigandhash)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
@@ -3853,7 +1940,7 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
/* idx == -2 means checking client certificate chains */
|
||||
if (idx == -2) {
|
||||
cpk = c->key;
|
||||
idx = cpk - c->pkeys;
|
||||
idx = (int)(cpk - c->pkeys);
|
||||
} else
|
||||
cpk = c->pkeys + idx;
|
||||
pvalid = s->s3->tmp.valid_flags + idx;
|
||||
@@ -3865,11 +1952,14 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
if (!x || !pk)
|
||||
goto end;
|
||||
} else {
|
||||
size_t certidx;
|
||||
|
||||
if (!x || !pk)
|
||||
return 0;
|
||||
idx = ssl_cert_type(x, pk);
|
||||
if (idx == -1)
|
||||
|
||||
if (ssl_cert_lookup_by_pkey(pk, &certidx) == NULL)
|
||||
return 0;
|
||||
idx = certidx;
|
||||
pvalid = s->s3->tmp.valid_flags + idx;
|
||||
|
||||
if (c->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT)
|
||||
@@ -3896,40 +1986,40 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
*/
|
||||
if (TLS1_get_version(s) >= TLS1_2_VERSION && strict_mode) {
|
||||
int default_nid;
|
||||
unsigned char rsign = 0;
|
||||
if (s->s3->tmp.peer_sigalgs)
|
||||
int rsign = 0;
|
||||
if (s->s3->tmp.peer_cert_sigalgs != NULL
|
||||
|| s->s3->tmp.peer_sigalgs != NULL) {
|
||||
default_nid = 0;
|
||||
/* If no sigalgs extension use defaults from RFC5246 */
|
||||
else {
|
||||
} else {
|
||||
switch (idx) {
|
||||
case SSL_PKEY_RSA_ENC:
|
||||
case SSL_PKEY_RSA_SIGN:
|
||||
rsign = TLSEXT_signature_rsa;
|
||||
case SSL_PKEY_RSA:
|
||||
rsign = EVP_PKEY_RSA;
|
||||
default_nid = NID_sha1WithRSAEncryption;
|
||||
break;
|
||||
|
||||
case SSL_PKEY_DSA_SIGN:
|
||||
rsign = TLSEXT_signature_dsa;
|
||||
rsign = EVP_PKEY_DSA;
|
||||
default_nid = NID_dsaWithSHA1;
|
||||
break;
|
||||
|
||||
case SSL_PKEY_ECC:
|
||||
rsign = TLSEXT_signature_ecdsa;
|
||||
rsign = EVP_PKEY_EC;
|
||||
default_nid = NID_ecdsa_with_SHA1;
|
||||
break;
|
||||
|
||||
case SSL_PKEY_GOST01:
|
||||
rsign = TLSEXT_signature_gostr34102001;
|
||||
rsign = NID_id_GostR3410_2001;
|
||||
default_nid = NID_id_GostR3411_94_with_GostR3410_2001;
|
||||
break;
|
||||
|
||||
case SSL_PKEY_GOST12_256:
|
||||
rsign = TLSEXT_signature_gostr34102012_256;
|
||||
rsign = NID_id_GostR3410_2012_256;
|
||||
default_nid = NID_id_tc26_signwithdigest_gost3410_2012_256;
|
||||
break;
|
||||
|
||||
case SSL_PKEY_GOST12_512:
|
||||
rsign = TLSEXT_signature_gostr34102012_512;
|
||||
rsign = NID_id_GostR3410_2012_512;
|
||||
default_nid = NID_id_tc26_signwithdigest_gost3410_2012_512;
|
||||
break;
|
||||
|
||||
@@ -3944,9 +2034,11 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
*/
|
||||
if (default_nid > 0 && c->conf_sigalgs) {
|
||||
size_t j;
|
||||
const unsigned char *p = c->conf_sigalgs;
|
||||
for (j = 0; j < c->conf_sigalgslen; j += 2, p += 2) {
|
||||
if (p[0] == TLSEXT_hash_sha1 && p[1] == rsign)
|
||||
const uint16_t *p = c->conf_sigalgs;
|
||||
for (j = 0; j < c->conf_sigalgslen; j++, p++) {
|
||||
const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(*p);
|
||||
|
||||
if (lu != NULL && lu->hash == NID_sha1 && lu->sig == rsign)
|
||||
break;
|
||||
}
|
||||
if (j == c->conf_sigalgslen) {
|
||||
@@ -3978,7 +2070,7 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
rv |= CERT_PKEY_EE_SIGNATURE | CERT_PKEY_CA_SIGNATURE;
|
||||
skip_sigs:
|
||||
/* Check cert parameters are consistent */
|
||||
if (tls1_check_cert_param(s, x, check_flags ? 1 : 2))
|
||||
if (tls1_check_cert_param(s, x, 1))
|
||||
rv |= CERT_PKEY_EE_PARAM;
|
||||
else if (!check_flags)
|
||||
goto end;
|
||||
@@ -4013,27 +2105,22 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
break;
|
||||
}
|
||||
if (check_type) {
|
||||
const unsigned char *ctypes;
|
||||
int ctypelen;
|
||||
if (c->ctypes) {
|
||||
ctypes = c->ctypes;
|
||||
ctypelen = (int)c->ctype_num;
|
||||
} else {
|
||||
ctypes = (unsigned char *)s->s3->tmp.ctype;
|
||||
ctypelen = s->s3->tmp.ctype_num;
|
||||
}
|
||||
for (i = 0; i < ctypelen; i++) {
|
||||
if (ctypes[i] == check_type) {
|
||||
const uint8_t *ctypes = s->s3->tmp.ctype;
|
||||
size_t j;
|
||||
|
||||
for (j = 0; j < s->s3->tmp.ctype_len; j++, ctypes++) {
|
||||
if (*ctypes == check_type) {
|
||||
rv |= CERT_PKEY_CERT_TYPE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!(rv & CERT_PKEY_CERT_TYPE) && !check_flags)
|
||||
goto end;
|
||||
} else
|
||||
} else {
|
||||
rv |= CERT_PKEY_CERT_TYPE;
|
||||
}
|
||||
|
||||
ca_dn = s->s3->tmp.ca_names;
|
||||
ca_dn = s->s3->tmp.peer_ca_names;
|
||||
|
||||
if (!sk_X509_NAME_num(ca_dn))
|
||||
rv |= CERT_PKEY_ISSUER_NAME;
|
||||
@@ -4061,12 +2148,9 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
|
||||
end:
|
||||
|
||||
if (TLS1_get_version(s) >= TLS1_2_VERSION) {
|
||||
if (*pvalid & CERT_PKEY_EXPLICIT_SIGN)
|
||||
rv |= CERT_PKEY_EXPLICIT_SIGN | CERT_PKEY_SIGN;
|
||||
else if (s->s3->tmp.md[idx] != NULL)
|
||||
rv |= CERT_PKEY_SIGN;
|
||||
} else
|
||||
if (TLS1_get_version(s) >= TLS1_2_VERSION)
|
||||
rv |= *pvalid & (CERT_PKEY_EXPLICIT_SIGN | CERT_PKEY_SIGN);
|
||||
else
|
||||
rv |= CERT_PKEY_SIGN | CERT_PKEY_EXPLICIT_SIGN;
|
||||
|
||||
/*
|
||||
@@ -4074,11 +2158,11 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
* chain is invalid.
|
||||
*/
|
||||
if (!check_flags) {
|
||||
if (rv & CERT_PKEY_VALID)
|
||||
if (rv & CERT_PKEY_VALID) {
|
||||
*pvalid = rv;
|
||||
else {
|
||||
/* Preserve explicit sign flag, clear rest */
|
||||
*pvalid &= CERT_PKEY_EXPLICIT_SIGN;
|
||||
} else {
|
||||
/* Preserve sign and explicit sign flag, clear rest */
|
||||
*pvalid &= CERT_PKEY_EXPLICIT_SIGN | CERT_PKEY_SIGN;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -4088,13 +2172,14 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
|
||||
/* Set validity of certificates in an SSL structure */
|
||||
void tls1_set_cert_validity(SSL *s)
|
||||
{
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_ENC);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_SIGN);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_RSA_PSS_SIGN);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_DSA_SIGN);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_ECC);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_GOST01);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_GOST12_256);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_GOST12_512);
|
||||
tls1_check_chain(s, NULL, NULL, NULL, SSL_PKEY_ED25519);
|
||||
}
|
||||
|
||||
/* User level utility function to check a chain is suitable */
|
||||
@@ -4115,8 +2200,9 @@ DH *ssl_get_auto_dh(SSL *s)
|
||||
else
|
||||
dh_secbits = 80;
|
||||
} else {
|
||||
CERT_PKEY *cpk = ssl_get_server_send_pkey(s);
|
||||
dh_secbits = EVP_PKEY_security_bits(cpk->privatekey);
|
||||
if (s->s3->tmp.cert == NULL)
|
||||
return NULL;
|
||||
dh_secbits = EVP_PKEY_security_bits(s->s3->tmp.cert->privatekey);
|
||||
}
|
||||
|
||||
if (dh_secbits >= 128) {
|
||||
@@ -4167,20 +2253,19 @@ static int ssl_security_cert_key(SSL *s, SSL_CTX *ctx, X509 *x, int op)
|
||||
static int ssl_security_cert_sig(SSL *s, SSL_CTX *ctx, X509 *x, int op)
|
||||
{
|
||||
/* Lookup signature algorithm digest */
|
||||
int secbits = -1, md_nid = NID_undef, sig_nid;
|
||||
int secbits, nid, pknid;
|
||||
/* Don't check signature if self signed */
|
||||
if ((X509_get_extension_flags(x) & EXFLAG_SS) != 0)
|
||||
return 1;
|
||||
sig_nid = X509_get_signature_nid(x);
|
||||
if (sig_nid && OBJ_find_sigid_algs(sig_nid, &md_nid, NULL)) {
|
||||
const EVP_MD *md;
|
||||
if (md_nid && (md = EVP_get_digestbynid(md_nid)))
|
||||
secbits = EVP_MD_size(md) * 4;
|
||||
}
|
||||
if (!X509_get_signature_info(x, &nid, &pknid, &secbits, NULL))
|
||||
secbits = -1;
|
||||
/* If digest NID not defined use signature NID */
|
||||
if (nid == NID_undef)
|
||||
nid = pknid;
|
||||
if (s)
|
||||
return ssl_security(s, op, secbits, md_nid, x);
|
||||
return ssl_security(s, op, secbits, nid, x);
|
||||
else
|
||||
return ssl_ctx_security(ctx, op, secbits, md_nid, x);
|
||||
return ssl_ctx_security(ctx, op, secbits, nid, x);
|
||||
}
|
||||
|
||||
int ssl_security_cert(SSL *s, SSL_CTX *ctx, X509 *x, int vfy, int is_ee)
|
||||
@@ -4226,3 +2311,271 @@ int ssl_security_cert_chain(SSL *s, STACK_OF(X509) *sk, X509 *x, int vfy)
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* For TLS 1.2 servers check if we have a certificate which can be used
|
||||
* with the signature algorithm "lu" and return index of certificate.
|
||||
*/
|
||||
|
||||
static int tls12_get_cert_sigalg_idx(const SSL *s, const SIGALG_LOOKUP *lu)
|
||||
{
|
||||
int sig_idx = lu->sig_idx;
|
||||
const SSL_CERT_LOOKUP *clu = ssl_cert_lookup_by_idx(sig_idx);
|
||||
|
||||
/* If not recognised or not supported by cipher mask it is not suitable */
|
||||
if (clu == NULL || !(clu->amask & s->s3->tmp.new_cipher->algorithm_auth))
|
||||
return -1;
|
||||
|
||||
return s->s3->tmp.valid_flags[sig_idx] & CERT_PKEY_VALID ? sig_idx : -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns true if |s| has a usable certificate configured for use
|
||||
* with signature scheme |sig|.
|
||||
* "Usable" includes a check for presence as well as applying
|
||||
* the signature_algorithm_cert restrictions sent by the peer (if any).
|
||||
* Returns false if no usable certificate is found.
|
||||
*/
|
||||
static int has_usable_cert(SSL *s, const SIGALG_LOOKUP *sig, int idx)
|
||||
{
|
||||
const SIGALG_LOOKUP *lu;
|
||||
int mdnid, pknid;
|
||||
size_t i;
|
||||
|
||||
/* TLS 1.2 callers can override lu->sig_idx, but not TLS 1.3 callers. */
|
||||
if (idx == -1)
|
||||
idx = sig->sig_idx;
|
||||
if (!ssl_has_cert(s, idx))
|
||||
return 0;
|
||||
if (s->s3->tmp.peer_cert_sigalgs != NULL) {
|
||||
for (i = 0; i < s->s3->tmp.peer_cert_sigalgslen; i++) {
|
||||
lu = tls1_lookup_sigalg(s->s3->tmp.peer_cert_sigalgs[i]);
|
||||
if (lu == NULL
|
||||
|| !X509_get_signature_info(s->cert->pkeys[idx].x509, &mdnid,
|
||||
&pknid, NULL, NULL))
|
||||
continue;
|
||||
/*
|
||||
* TODO this does not differentiate between the
|
||||
* rsa_pss_pss_* and rsa_pss_rsae_* schemes since we do not
|
||||
* have a chain here that lets us look at the key OID in the
|
||||
* signing certificate.
|
||||
*/
|
||||
if (mdnid == lu->hash && pknid == lu->sig)
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Choose an appropriate signature algorithm based on available certificates
|
||||
* Sets chosen certificate and signature algorithm.
|
||||
*
|
||||
* For servers if we fail to find a required certificate it is a fatal error,
|
||||
* an appropriate error code is set and a TLS alert is sent.
|
||||
*
|
||||
* For clients fatalerrs is set to 0. If a certificate is not suitable it is not
|
||||
* a fatal error: we will either try another certificate or not present one
|
||||
* to the server. In this case no error is set.
|
||||
*/
|
||||
int tls_choose_sigalg(SSL *s, int fatalerrs)
|
||||
{
|
||||
const SIGALG_LOOKUP *lu = NULL;
|
||||
int sig_idx = -1;
|
||||
|
||||
s->s3->tmp.cert = NULL;
|
||||
s->s3->tmp.sigalg = NULL;
|
||||
|
||||
if (SSL_IS_TLS13(s)) {
|
||||
size_t i;
|
||||
#ifndef OPENSSL_NO_EC
|
||||
int curve = -1, skip_ec = 0;
|
||||
#endif
|
||||
|
||||
/* Look for a certificate matching shared sigalgs */
|
||||
for (i = 0; i < s->cert->shared_sigalgslen; i++) {
|
||||
lu = s->cert->shared_sigalgs[i];
|
||||
sig_idx = -1;
|
||||
|
||||
/* Skip SHA1, SHA224, DSA and RSA if not PSS */
|
||||
if (lu->hash == NID_sha1
|
||||
|| lu->hash == NID_sha224
|
||||
|| lu->sig == EVP_PKEY_DSA
|
||||
|| lu->sig == EVP_PKEY_RSA)
|
||||
continue;
|
||||
/* Check that we have a cert, and signature_algorithms_cert */
|
||||
if (!tls1_lookup_md(lu, NULL) || !has_usable_cert(s, lu, -1))
|
||||
continue;
|
||||
if (lu->sig == EVP_PKEY_EC) {
|
||||
#ifndef OPENSSL_NO_EC
|
||||
if (curve == -1) {
|
||||
EC_KEY *ec = EVP_PKEY_get0_EC_KEY(s->cert->pkeys[SSL_PKEY_ECC].privatekey);
|
||||
|
||||
curve = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
|
||||
if (EC_KEY_get_conv_form(ec)
|
||||
!= POINT_CONVERSION_UNCOMPRESSED)
|
||||
skip_ec = 1;
|
||||
}
|
||||
if (skip_ec || (lu->curve != NID_undef && curve != lu->curve))
|
||||
continue;
|
||||
#else
|
||||
continue;
|
||||
#endif
|
||||
} else if (lu->sig == EVP_PKEY_RSA_PSS) {
|
||||
/* validate that key is large enough for the signature algorithm */
|
||||
EVP_PKEY *pkey;
|
||||
|
||||
pkey = s->cert->pkeys[lu->sig_idx].privatekey;
|
||||
if (!rsa_pss_check_min_key_size(EVP_PKEY_get0(pkey), lu))
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (i == s->cert->shared_sigalgslen) {
|
||||
if (!fatalerrs)
|
||||
return 1;
|
||||
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_TLS_CHOOSE_SIGALG,
|
||||
SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
/* If ciphersuite doesn't require a cert nothing to do */
|
||||
if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aCERT))
|
||||
return 1;
|
||||
if (!s->server && !ssl_has_cert(s, s->cert->key - s->cert->pkeys))
|
||||
return 1;
|
||||
|
||||
if (SSL_USE_SIGALGS(s)) {
|
||||
size_t i;
|
||||
if (s->s3->tmp.peer_sigalgs != NULL) {
|
||||
#ifndef OPENSSL_NO_EC
|
||||
int curve;
|
||||
|
||||
/* For Suite B need to match signature algorithm to curve */
|
||||
if (tls1_suiteb(s)) {
|
||||
EC_KEY *ec = EVP_PKEY_get0_EC_KEY(s->cert->pkeys[SSL_PKEY_ECC].privatekey);
|
||||
curve = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
|
||||
} else {
|
||||
curve = -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Find highest preference signature algorithm matching
|
||||
* cert type
|
||||
*/
|
||||
for (i = 0; i < s->cert->shared_sigalgslen; i++) {
|
||||
lu = s->cert->shared_sigalgs[i];
|
||||
|
||||
if (s->server) {
|
||||
if ((sig_idx = tls12_get_cert_sigalg_idx(s, lu)) == -1)
|
||||
continue;
|
||||
} else {
|
||||
int cc_idx = s->cert->key - s->cert->pkeys;
|
||||
|
||||
sig_idx = lu->sig_idx;
|
||||
if (cc_idx != sig_idx)
|
||||
continue;
|
||||
}
|
||||
/* Check that we have a cert, and sig_algs_cert */
|
||||
if (!has_usable_cert(s, lu, sig_idx))
|
||||
continue;
|
||||
if (lu->sig == EVP_PKEY_RSA_PSS) {
|
||||
/* validate that key is large enough for the signature algorithm */
|
||||
EVP_PKEY *pkey = s->cert->pkeys[sig_idx].privatekey;
|
||||
|
||||
if (!rsa_pss_check_min_key_size(EVP_PKEY_get0(pkey), lu))
|
||||
continue;
|
||||
}
|
||||
#ifndef OPENSSL_NO_EC
|
||||
if (curve == -1 || lu->curve == curve)
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
if (i == s->cert->shared_sigalgslen) {
|
||||
if (!fatalerrs)
|
||||
return 1;
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CHOOSE_SIGALG,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
/*
|
||||
* If we have no sigalg use defaults
|
||||
*/
|
||||
const uint16_t *sent_sigs;
|
||||
size_t sent_sigslen;
|
||||
|
||||
if ((lu = tls1_get_legacy_sigalg(s, -1)) == NULL) {
|
||||
if (!fatalerrs)
|
||||
return 1;
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CHOOSE_SIGALG,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Check signature matches a type we sent */
|
||||
sent_sigslen = tls12_get_psigalgs(s, 1, &sent_sigs);
|
||||
for (i = 0; i < sent_sigslen; i++, sent_sigs++) {
|
||||
if (lu->sigalg == *sent_sigs
|
||||
&& has_usable_cert(s, lu, lu->sig_idx))
|
||||
break;
|
||||
}
|
||||
if (i == sent_sigslen) {
|
||||
if (!fatalerrs)
|
||||
return 1;
|
||||
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
|
||||
SSL_F_TLS_CHOOSE_SIGALG,
|
||||
SSL_R_WRONG_SIGNATURE_TYPE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ((lu = tls1_get_legacy_sigalg(s, -1)) == NULL) {
|
||||
if (!fatalerrs)
|
||||
return 1;
|
||||
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CHOOSE_SIGALG,
|
||||
ERR_R_INTERNAL_ERROR);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sig_idx == -1)
|
||||
sig_idx = lu->sig_idx;
|
||||
s->s3->tmp.cert = &s->cert->pkeys[sig_idx];
|
||||
s->cert->key = s->s3->tmp.cert;
|
||||
s->s3->tmp.sigalg = lu;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int SSL_CTX_set_tlsext_max_fragment_length(SSL_CTX *ctx, uint8_t mode)
|
||||
{
|
||||
if (mode != TLSEXT_max_fragment_length_DISABLED
|
||||
&& !IS_MAX_FRAGMENT_LENGTH_EXT_VALID(mode)) {
|
||||
SSLerr(SSL_F_SSL_CTX_SET_TLSEXT_MAX_FRAGMENT_LENGTH,
|
||||
SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
|
||||
return 0;
|
||||
}
|
||||
|
||||
ctx->ext.max_fragment_len_mode = mode;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int SSL_set_tlsext_max_fragment_length(SSL *ssl, uint8_t mode)
|
||||
{
|
||||
if (mode != TLSEXT_max_fragment_length_DISABLED
|
||||
&& !IS_MAX_FRAGMENT_LENGTH_EXT_VALID(mode)) {
|
||||
SSLerr(SSL_F_SSL_SET_TLSEXT_MAX_FRAGMENT_LENGTH,
|
||||
SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
|
||||
return 0;
|
||||
}
|
||||
|
||||
ssl->ext.max_fragment_len_mode = mode;
|
||||
return 1;
|
||||
}
|
||||
|
||||
uint8_t SSL_SESSION_get_max_fragment_length(const SSL_SESSION *session)
|
||||
{
|
||||
return session->ext.max_fragment_len_mode;
|
||||
}
|
||||
Reference in New Issue
Block a user