diff options
| author | Matt Caswell <matt@openssl.org> | 2020-05-21 16:36:32 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-06-19 10:19:31 +0100 |
| commit | 260009d877bfd6fe75aef08ecf4c366127f1f78e (patch) | |
| tree | c054d1dfa8752082864c51a0f497c615897d658b /ssl/ssl_local.h | |
| parent | 90929138d73ae46fe2fa3014028ab010043af23e (diff) | |
Update the various SSL group getting and setting functions
A number of these functions returned a NID or an array of NIDs for the
groups. Now that groups can come from the providers we do not necessarily
know the NID. Therefore we need to handle this in a clean way.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11914)
Diffstat (limited to 'ssl/ssl_local.h')
| -rw-r--r-- | ssl/ssl_local.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 017e8f95c9..58bc1f99c4 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -2636,12 +2636,12 @@ __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); __owur const TLS_GROUP_INFO *tls1_group_id_lookup(SSL_CTX *ctx, uint16_t curve_id); -__owur int tls1_group_id2nid(uint16_t group_id); +__owur int tls1_group_id2nid(uint16_t group_id, int include_unknown); __owur int tls1_check_group_id(SSL *s, uint16_t group_id, int check_own_curves); __owur uint16_t tls1_shared_group(SSL *s, int nmatch); __owur int tls1_set_groups(uint16_t **pext, size_t *pextlen, int *curves, size_t ncurves); -__owur int tls1_set_groups_list(uint16_t **pext, size_t *pextlen, +__owur int tls1_set_groups_list(SSL_CTX *ctx, uint16_t **pext, size_t *pextlen, const char *str); __owur EVP_PKEY *ssl_generate_pkey_group(SSL *s, uint16_t id); __owur int tls_valid_group(SSL *s, uint16_t group_id, int minversion, |