From d160cb81a85b9bf887647818789ea24776454384 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 6 Jan 2016 07:49:28 -0700 Subject: [PATCH] raco pkg: use 'secure for an HTTPS catalog --- racket/collects/net/git-checkout.rkt | 6 ++---- racket/collects/pkg/private/network.rkt | 8 +++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/racket/collects/net/git-checkout.rkt b/racket/collects/net/git-checkout.rkt index f41bb366f8..6ebc1caa75 100644 --- a/racket/collects/net/git-checkout.rkt +++ b/racket/collects/net/git-checkout.rkt @@ -7,7 +7,6 @@ file/gunzip file/private/check-path openssl/sha1 - openssl net/url net/head net/http-client @@ -282,11 +281,10 @@ (define (ssl-context verify?) (cond [(or (not verify?) - (getenv "GIT_SSL_NO_VERIFY") - (not ssl-available?)) + (getenv "GIT_SSL_NO_VERIFY")) (current-https-protocol)] [else - (ssl-secure-client-context)])) + 'secure])) ;; ---------------------------------------- diff --git a/racket/collects/pkg/private/network.rkt b/racket/collects/pkg/private/network.rkt index 159e1f7283..32baf25aa7 100644 --- a/racket/collects/pkg/private/network.rkt +++ b/racket/collects/pkg/private/network.rkt @@ -1,5 +1,6 @@ #lang racket/base (require net/url + net/url-connect racket/format "print.rkt" "config.rkt") @@ -57,9 +58,10 @@ (lambda (f) (f))) (lambda () (define-values (p hs) - (get-pure-port/headers url headers - #:redirections 25 - #:status? #t)) + (parameterize ([current-https-protocol 'secure]) + (get-pure-port/headers url headers + #:redirections 25 + #:status? #t))) (define status (string->number (substring hs 9 12))) (cond [(memv status success-codes)