diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-08-15 14:07:33 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-15 14:07:33 +0100 |
| commit | 0a699a0723bcc689c07c8110da0fff7f9c2356a4 (patch) | |
| tree | eb1b4ef5bfad7f8d74a5a9b3ec585a0e728e1638 /ssl/ssl_locl.h | |
| parent | 0818dbadf32d193973d84a0736c099166777c071 (diff) | |
| download | openssl-0a699a0723bcc689c07c8110da0fff7f9c2356a4.zip openssl-0a699a0723bcc689c07c8110da0fff7f9c2356a4.tar.gz openssl-0a699a0723bcc689c07c8110da0fff7f9c2356a4.tar.bz2 | |
Fix no-ec
Fix no-ec builds by having separate functions to create keys based on
an existing EVP_PKEY and a curve id.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 3c230d1..8566760 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1857,7 +1857,7 @@ void ssl_load_ciphers(void); __owur int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len); __owur int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen, int free_pms); -__owur EVP_PKEY *ssl_generate_pkey(EVP_PKEY *pm, int nid); +__owur EVP_PKEY *ssl_generate_pkey(EVP_PKEY *pm); __owur int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey); __owur EVP_PKEY *ssl_dh_to_pkey(DH *dh); @@ -2002,6 +2002,7 @@ __owur int tls1_set_curves(unsigned char **pext, size_t *pextlen, __owur int tls1_set_curves_list(unsigned char **pext, size_t *pextlen, const char *str); __owur int tls1_check_ec_tmp_key(SSL *s, unsigned long id); +__owur EVP_PKEY *ssl_generate_pkey_curve(int id); # endif /* OPENSSL_NO_EC */ __owur int tls1_shared_list(SSL *s, |