From bf8b96c029f4a90ebcc61159a6b8ae2fa522bc2c Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 18 May 2008 19:08:56 -0500 Subject: [PATCH] SSL fixes --- extra/io/unix/sockets/secure/secure.factor | 2 +- extra/openssl/openssl-tests.factor | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extra/io/unix/sockets/secure/secure.factor b/extra/io/unix/sockets/secure/secure.factor index ffd202dc0e..9feeb90690 100755 --- a/extra/io/unix/sockets/secure/secure.factor +++ b/extra/io/unix/sockets/secure/secure.factor @@ -26,7 +26,7 @@ M: ssl-handle handle-fd file>> handle-fd ; over handle>> handle>> over SSL_get_error ; inline ! Input ports -: check-read-response ( port r -- event ) USING: namespaces io prettyprint ; +: check-read-response ( port r -- event ) check-response { { SSL_ERROR_NONE [ swap buffer>> n>buffer f ] } diff --git a/extra/openssl/openssl-tests.factor b/extra/openssl/openssl-tests.factor index 30c36c0315..0ef48bd433 100755 --- a/extra/openssl/openssl-tests.factor +++ b/extra/openssl/openssl-tests.factor @@ -1,21 +1,21 @@ USING: io.sockets.secure io.encodings.ascii alien.strings openssl namespaces accessors tools.test continuations kernel ; -openssl ssl-backend [ +openssl secure-socket-backend [ [ ] [ - + "resource:extra/openssl/test/server.pem" >>key-file "resource:extra/openssl/test/root.pem" >>ca-file "resource:extra/openssl/test/dh1024.pem" >>dh-file "password" ascii string>alien >>password - [ ] with-ssl-context + [ ] with-secure-context ] unit-test [ - + "resource:extra/openssl/test/server.pem" >>key-file "resource:extra/openssl/test/root.pem" >>ca-file "wrong password" ascii string>alien >>password - [ ] with-ssl-context + [ ] with-secure-context ] must-fail ] with-variable