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

Revert "openssl: define a startup-hook so that openssl initializes automatically" 

This reverts commit 981ea313a0.

Conflicts:
	basis/openssl/openssl.factor
db4
John Benediktsson 2014-08-05 12:14:53 -07:00
parent f8c4827095
commit 8c58b99b1d
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/checksums/openssl/openssl.factor
View File

@ -29,7 +29,7 @@ M: evp-md-context dispose*
handle>> EVP_MD_CTX_destroy ; handle>> EVP_MD_CTX_destroy ;
: with-evp-md-context ( quot -- ) : with-evp-md-context ( quot -- )
[ <evp-md-context> ] dip with-disposal ; inline maybe-init-ssl [ <evp-md-context> ] dip with-disposal ; inline
: digest-named ( name -- md ) : digest-named ( name -- md )
dup EVP_get_digestbyname dup EVP_get_digestbyname

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

@ -127,6 +127,7 @@ M: rsa dispose* handle>> RSA_free ;
H{ } clone >>sessions ; H{ } clone >>sessions ;
M: openssl <secure-context> ( config -- context ) M: openssl <secure-context> ( config -- context )
maybe-init-ssl
[ [
dup method>> ssl-method SSL_CTX_new dup method>> ssl-method SSL_CTX_new
dup ssl-error <openssl-context> |dispose dup ssl-error <openssl-context> |dispose

13
basis/openssl/openssl.factor
View File

@ -1,6 +1,7 @@
! Copyright (C) 2007, 2008, Slava Pestov, Elie CHAFTARI. ! Copyright (C) 2007, 2008, Slava Pestov, Elie CHAFTARI.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: init kernel openssl.libcrypto openssl.libssl sequences ; USING: init kernel namespaces openssl.libcrypto openssl.libssl
sequences ;
IN: openssl IN: openssl
! This code is based on http://www.rtfm.com/openssl-examples/ ! This code is based on http://www.rtfm.com/openssl-examples/
@ -25,4 +26,12 @@ SINGLETON: openssl
OpenSSL_add_all_digests OpenSSL_add_all_digests
OpenSSL_add_all_ciphers ; OpenSSL_add_all_ciphers ;
[ init-ssl ] "openssl" add-startup-hook SYMBOL: ssl-initialized?
: maybe-init-ssl ( -- )
ssl-initialized? get-global [
init-ssl
t ssl-initialized? set-global
] unless ;
[ f ssl-initialized? set-global ] "openssl" add-startup-hook