From b4d7885b16afa275681a2adaf780e5c4d585da60 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Fri, 28 Jun 2019 17:56:37 +0200 Subject: [PATCH] openssl: fix ssl-addresses, docs for ports->ssl-ports --- pkgs/racket-doc/openssl/openssl.scrbl | 5 +++-- racket/collects/openssl/mzssl.rkt | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/racket-doc/openssl/openssl.scrbl b/pkgs/racket-doc/openssl/openssl.scrbl index f363a98a51..db2ee94499 100644 --- a/pkgs/racket-doc/openssl/openssl.scrbl +++ b/pkgs/racket-doc/openssl/openssl.scrbl @@ -328,7 +328,8 @@ Analogous to @racket[tcp-abandon-port].} @defproc[(ssl-addresses [p (or/c ssl-port? ssl-listener?)] [port-numbers? any/c #f]) - void?]{ + (or/c (values string? string?) + (values string? port-number? string? listen-port-number?))]{ Analogous to @racket[tcp-addresses].} @@ -398,7 +399,7 @@ current platform for server connections. @defproc[(ports->ssl-ports [input-port input-port?] [output-port output-port?] - [#:mode mode symbol? 'accept] + [#:mode mode (or/c 'connect 'accept) 'accept] [#:context context (or/c ssl-client-context? ssl-server-context?) ((if (eq? mode 'accept) diff --git a/racket/collects/openssl/mzssl.rkt b/racket/collects/openssl/mzssl.rkt index e9700a0403..6bf45d6584 100644 --- a/racket/collects/openssl/mzssl.rkt +++ b/racket/collects/openssl/mzssl.rkt @@ -1543,10 +1543,12 @@ TO DO: (define (ssl-addresses p [port-numbers? #f]) (let-values ([(mzssl input?) (lookup 'ssl-addresses p)]) - (tcp-addresses (if (eq? 'listener input?) - (ssl-listener-l mzssl) - (if input? (mzssl-i mzssl) (mzssl-o mzssl))) - port-numbers?))) + (define port + (if (eq? 'listener input?) + (ssl-listener-l mzssl) + (if input? (mzssl-i mzssl) (mzssl-o mzssl)))) + (cond [(tcp-port? port) (tcp-addresses port port-numbers?)] + [else (error 'ssl-addresses "not connected to TCP port")]))) (define (ssl-abandon-port p) (let-values ([(mzssl input?) (lookup 'ssl-abandon-port p)])