steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

openssl: only set RSA keys if required to do so 

Modern OpenSSL and LibreSSL both do not require SSL_CTX_set_tmp_rsa to
be called unless SSL_CTX_need_tmp_rsa returns true, and LibreSSL and
OpenSSL compiled with deprecation warnings both will fail if this
happens. This commit resolves that.

With this change, it becomes possible to use LibreSSL in place of
OpenSSL with Factor.
db4
Benjamin Pollack 2016-02-23 08:09:07 -05:00
parent 8073c8a77e
commit 12af22f3ee
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/io/sockets/secure/openssl/openssl.factor
View File

@ -123,7 +123,11 @@ TUPLE: rsa < disposable handle ;
M: rsa dispose* handle>> RSA_free ; M: rsa dispose* handle>> RSA_free ;
: needs-rsa-key ( ctx -- ? )
handle>> SSL_CTX_need_tmp_rsa 0 = not ; inline
: generate-eph-rsa-key ( ctx -- ) : generate-eph-rsa-key ( ctx -- )
dup needs-rsa-key [
[ handle>> ] [ handle>> ]
[| ctx | [| ctx |
RSA_new :> rsa-struct RSA_new :> rsa-struct
@ -133,7 +137,7 @@ M: rsa dispose* handle>> RSA_free ;
f RSA_generate_key_ex f RSA_generate_key_ex
ssl-error rsa-struct <rsa> &dispose handle>> ssl-error rsa-struct <rsa> &dispose handle>>
] bi ] bi
SSL_CTX_set_tmp_rsa ssl-error ; SSL_CTX_set_tmp_rsa ssl-error ] [ drop ] if ;
: <openssl-context> ( config ctx -- context ) : <openssl-context> ( config ctx -- context )
openssl-context new-disposable openssl-context new-disposable

3
basis/openssl/libssl/libssl.factor
View File

@ -410,6 +410,9 @@ FUNCTION: void SSL_CTX_set_tmp_rsa_callback ( SSL_CTX* ctx, void* rsa )
FUNCTION: void* BIO_f_ssl ( ) FUNCTION: void* BIO_f_ssl ( )
: SSL_CTX_need_tmp_rsa ( ctx -- n )
SSL_CTRL_NEED_TMP_RSA 0 f SSL_CTX_ctrl ;
: SSL_CTX_set_tmp_rsa ( ctx rsa -- n ) : SSL_CTX_set_tmp_rsa ( ctx rsa -- n )
[ SSL_CTRL_SET_TMP_RSA 0 ] dip SSL_CTX_ctrl ; [ SSL_CTRL_SET_TMP_RSA 0 ] dip SSL_CTX_ctrl ;