diff --git a/basis/checksums/openssl/openssl.factor b/basis/checksums/openssl/openssl.factor index 41c8537d45..e499c260c6 100644 --- a/basis/checksums/openssl/openssl.factor +++ b/basis/checksums/openssl/openssl.factor @@ -29,7 +29,7 @@ M: evp-md-context dispose* handle>> EVP_MD_CTX_destroy ; : with-evp-md-context ( quot -- ) - maybe-init-ssl [ ] dip with-disposal ; inline + [ ] dip with-disposal ; inline : digest-named ( name -- md ) dup EVP_get_digestbyname diff --git a/basis/io/sockets/secure/openssl/openssl.factor b/basis/io/sockets/secure/openssl/openssl.factor index d010fa80e5..a215cf8286 100644 --- a/basis/io/sockets/secure/openssl/openssl.factor +++ b/basis/io/sockets/secure/openssl/openssl.factor @@ -124,7 +124,6 @@ M: rsa dispose* handle>> RSA_free ; H{ } clone >>sessions ; M: openssl ( config -- context ) - maybe-init-ssl [ dup method>> ssl-method SSL_CTX_new dup ssl-error |dispose diff --git a/basis/openssl/openssl.factor b/basis/openssl/openssl.factor index 9315e43a39..84ffcb8e2c 100644 --- a/basis/openssl/openssl.factor +++ b/basis/openssl/openssl.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007, 2008, Slava Pestov, Elie CHAFTARI. ! See http://factorcode.org/license.txt for BSD license. -USING: init kernel namespaces openssl.libcrypto openssl.libssl +USING: init io kernel namespaces openssl.libcrypto openssl.libssl sequences ; IN: openssl @@ -26,12 +26,4 @@ SINGLETON: openssl OpenSSL_add_all_digests OpenSSL_add_all_ciphers ; -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 +[ init-ssl ] "openssl" add-startup-hook