diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-09-22 23:47:54 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-09-26 13:00:26 +0100 |
| commit | 0e464d9ddd3b7995bce27d780f8295f47ac5a647 (patch) | |
| tree | cf1bc6496badfcb2ae228c7fdd98b33140d47abd /ssl | |
| parent | 8841154a90914c6f8cb4649beed36f8d1b82a19c (diff) | |
| download | openssl-0e464d9ddd3b7995bce27d780f8295f47ac5a647.zip openssl-0e464d9ddd3b7995bce27d780f8295f47ac5a647.tar.gz openssl-0e464d9ddd3b7995bce27d780f8295f47ac5a647.tar.bz2 | |
Rename tls_curve_info to TLS_GROUP_INFO, move to ssl_locl.h
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/=4412)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_locl.h | 18 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 69f547e..aa99153 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1349,6 +1349,18 @@ typedef struct sigalg_lookup_st { int curve; } SIGALG_LOOKUP; +typedef struct tls_group_info_st { + int nid; /* Curve NID */ + int secbits; /* Bits of security (from SP800-57) */ + uint16_t flags; /* Flags: currently just group type */ +} TLS_GROUP_INFO; + +/* flags values */ +# define TLS_CURVE_TYPE 0x3 /* Mask for group type */ +# define TLS_CURVE_PRIME 0x0 +# define TLS_CURVE_CHAR2 0x1 +# define TLS_CURVE_CUSTOM 0x2 + typedef struct cert_pkey_st CERT_PKEY; /* @@ -2326,12 +2338,6 @@ __owur int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); # ifndef OPENSSL_NO_EC -/* Flags values from tls1_ec_curve_id2nid() */ -/* Mask for curve type */ -# define TLS_CURVE_TYPE 0x3 -# define TLS_CURVE_PRIME 0x0 -# define TLS_CURVE_CHAR2 0x1 -# define TLS_CURVE_CUSTOM 0x2 __owur int tls1_ec_curve_id2nid(uint16_t curve_id, unsigned int *pflags); __owur uint16_t tls1_ec_nid2curve_id(int nid); diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 4345576..0f57b53 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -130,18 +130,12 @@ int tls1_clear(SSL *s) #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) */ @@ -194,7 +188,7 @@ static const uint16_t suiteb_curves[] = { int tls1_ec_curve_id2nid(uint16_t curve_id, unsigned int *pflags) { - const tls_curve_info *cinfo; + const TLS_GROUP_INFO *cinfo; /* ECC curves from RFC 4492 and RFC 7027 */ if (curve_id < 1 || curve_id > OSSL_NELEM(nid_list)) return NID_undef; @@ -265,7 +259,7 @@ int tls1_get_curvelist(SSL *s, int sess, const uint16_t **pcurves, /* See if curve is allowed by security callback */ int tls_curve_allowed(SSL *s, uint16_t curve, int op) { - const tls_curve_info *cinfo; + const TLS_GROUP_INFO *cinfo; unsigned char ctmp[2]; if (curve > 0xff) return 1; |