     [ >lower ] bi@ "*." ?head [ tail? ] [ = ] if ;
 
 : check-subject-name ( host ssl-handle -- )
-    SSL_get_peer_certificate [ alternative-dns-names ] [ subject-name ] bi
-    suffix 2dup [ subject-names-match? ] with filter empty?
-    [ subject-name-verify-error ] [ 2drop ] if ;
+    SSL_get_peer_certificate
+    [ alternative-dns-names ] [ subject-name ] bi suffix
+    2dup [ subject-names-match? ] with any?
+    [ 2drop ] [ subject-name-verify-error ] if ;
 
 M: openssl check-certificate ( host ssl -- )
     current-secure-context config>> verify>> [

: issuer-name ( certificate -- issuer )
    X509_get_issuer_name x509name>string ;

: name-stack>seq ( name-stack -- seq )
    dup sk_num iota [ sk_value GENERAL_NAME_st memory>struct ] with map ;

: alternative-dns-names ( certificate -- dns-names )
    NID_subject_alt_name f f X509_get_ext_d2i [ name-stack>seq ] [ { } ] if*
    [ type>> GEN_DNS = ] filter
    [ d>> dNSName>> data>> utf8 alien>string ] map ;


! 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
io.backend io.encodings.8-bit.latin1 io.encodings.utf8
io.pathnames io.sockets.secure kernel libc 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 )
