io.sockets.secure: Move some code from secure.unix to secure.openssl. Add a hook for finding sockets to upgrade.

basis/io/sockets/secure/openssl/openssl.factor

@@ -1,11 +1,13 @@
 ! Copyright (C) 2007, 2008, Slava Pestov, Elie CHAFTARI.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.data alien.strings
-assocs byte-arrays classes.struct combinators destructors fry
+assocs byte-arrays classes.struct combinators destructors fry io
-io.backend io.buffers io.encodings.8-bit.latin1 io.encodings.utf8
+io.backend io.buffers io.encodings.8-bit.latin1
-io.files io.pathnames io.sockets.secure io.timeouts kernel libc
+io.encodings.utf8 io.files io.pathnames io.ports io.sockets
-locals math math.order math.parser namespaces openssl openssl.libssl
+io.sockets.secure io.sockets.secure.unix io.timeouts kernel libc
-openssl.libcrypto random sequences splitting unicode.case ;
+locals math math.order math.parser namespaces openssl
+openssl.libcrypto openssl.libssl random sequences splitting
+unicode.case ;
 IN: io.sockets.secure.openssl
 
 GENERIC: ssl-method ( symbol -- method )
@@ -313,4 +315,33 @@ M: openssl check-certificate ( host ssl -- )
         2bi
     ] [ 2drop ] if ;
 
+: check-buffer ( port -- port )
+    dup buffer>> buffer-empty? [ upgrade-buffers-full ] unless ;
+
+: input/output-ports ( -- input output )
+    input-stream output-stream
+    [ get underlying-port check-buffer ] bi@
+    2dup [ handle>> ] bi@ eq? [ upgrade-on-non-socket ] unless ;
+
+: make-input/output-secure ( input output -- )
+    dup handle>> non-ssl-socket? [ upgrade-on-non-socket ] unless
+    [ <ssl-socket> ] change-handle
+    handle>> >>handle drop ;
+
+: (send-secure-handshake) ( output -- )
+    remote-address get [ upgrade-on-non-socket ] unless*
+    secure-connection ;
+
+M: openssl send-secure-handshake
+    input/output-ports
+    [ make-input/output-secure ] keep
+    [ (send-secure-handshake) ] keep
+    remote-address get dup inet? [
+        host>> swap handle>> check-certificate
+    ] [ 2drop ] if ;
+
+M: openssl accept-secure-handshake ( -- )
+    input/output-ports
+    make-input/output-secure ;
+
 openssl secure-socket-backend set-global

basis/io/sockets/secure/secure.factor

@@ -102,6 +102,8 @@ M: upgrade-buffers-full summary
     drop
     "send-secure-handshake can only be used if buffers are empty" ;
 
+HOOK: non-ssl-socket? os ( obj -- ? )
+
 HOOK: send-secure-handshake secure-socket-backend ( -- )
 
 HOOK: accept-secure-handshake secure-socket-backend ( -- )

basis/io/sockets/secure/unix/unix.factor

@@ -61,31 +61,4 @@ M: ssl-handle shutdown
         f >>connected [ (shutdown) ] with-timeout
     ] [ drop ] if ;
 
-: check-buffer ( port -- port )
+M: unix non-ssl-socket? ( obj -- ? ) fd? ;
-    dup buffer>> buffer-empty? [ upgrade-buffers-full ] unless ;
-
-: input/output-ports ( -- input output )
-    input-stream output-stream
-    [ get underlying-port check-buffer ] bi@
-    2dup [ handle>> ] bi@ eq? [ upgrade-on-non-socket ] unless ;
-
-: make-input/output-secure ( input output -- )
-    dup handle>> fd? [ upgrade-on-non-socket ] unless
-    [ <ssl-socket> ] change-handle
-    handle>> >>handle drop ;
-
-: (send-secure-handshake) ( output -- )
-    remote-address get [ upgrade-on-non-socket ] unless*
-    secure-connection ;
-
-M: openssl send-secure-handshake
-    input/output-ports
-    [ make-input/output-secure ] keep
-    [ (send-secure-handshake) ] keep
-    remote-address get dup inet? [
-        host>> swap handle>> check-certificate
-    ] [ 2drop ] if ;
-
-M: openssl accept-secure-handshake
-    input/output-ports
-    make-input/output-secure ;

basis/io/sockets/secure/windows/windows.factor

@@ -26,3 +26,5 @@ M:: secure establish-connection ( client-out addrspec -- )
     socket <output-port> addrspec addrspec>> establish-connection
     client-out addrspec secure-connection
     socket FIONBIO 0 set-ioctl-socket ;
+
+M: windows non-ssl-socket? win32-socket? ;