Commit ac48fba0 authored by Antoine Salon's avatar Antoine Salon Committed by Matt Caswell
Browse files

Deprecate SSL_set_tmp_ecdh 



Signed-off-by: default avatarAntoine Salon <asalon@vmware.com>

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7522)
parent ebfd055b

doc/man3/SSL_CTX_set_tmp_ecdh.pod

+2 −0
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ long SSL_set_ecdh_auto(SSL *ssl, int state); 


SSL_CTX_set_tmp_ecdh() sets ECDH parameters to be used to be B<ecdh>.

The key is inherited by all B<ssl> objects created from B<ctx>.

This macro is deprecated in favor of L<SSL_CTX_set1_groups(3)>.



SSL_set_tmp_ecdh() sets the parameters only for B<ssl>.

This macro is deprecated in favor of L<SSL_set1_groups(3)>.



SSL_CTX_set_ecdh_auto() and SSL_set_ecdh_auto() are deprecated and

have no effect.

include/openssl/ssl.h

+5 −3
Original line number Diff line number Diff line
@@ -1307,16 +1307,18 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) 
        SSL_ctrl((ssl),SSL_CTRL_GET_TOTAL_RENEGOTIATIONS,0,NULL)

# define SSL_CTX_set_tmp_dh(ctx,dh) \

        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,(char *)(dh))

# define SSL_CTX_set_tmp_ecdh(ctx,ecdh) \

        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_ECDH,0,(char *)(ecdh))

# define SSL_CTX_set_dh_auto(ctx, onoff) \

        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_DH_AUTO,onoff,NULL)

# define SSL_set_dh_auto(s, onoff) \

        SSL_ctrl(s,SSL_CTRL_SET_DH_AUTO,onoff,NULL)

# define SSL_set_tmp_dh(ssl,dh) \

        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH,0,(char *)(dh))

# if OPENSSL_API_COMPAT < 0x10200000L

#  define SSL_CTX_set_tmp_ecdh(ctx,ecdh) \

        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_ECDH,0,(char *)(ecdh))

#  define SSL_set_tmp_ecdh(ssl,ecdh) \

        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)(ecdh))

# endif

# define SSL_CTX_add_extra_chain_cert(ctx,x509) \

        SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)(x509))

# define SSL_CTX_get_extra_chain_certs(ctx,px509) \