Commit 0e464d9d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Rename tls_curve_info to TLS_GROUP_INFO, move to ssl_locl.h 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/=4412)
parent 8841154a

ssl/ssl_locl.h

+12 −6
Original line number Diff line number Diff line
@@ -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);

ssl/t1_lib.c

+3 −9
Original line number Diff line number Diff line
@@ -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;