[tor-commits] [meek/master] Export certContext.GetCertificate.

dcf at torproject.org dcf at torproject.org
Fri Mar 31 03:54:23 UTC 2017


commit d60a7508f5fce26681a52842fd50af7692544ec0
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Mar 23 01:11:31 2017 -0700

    Export certContext.GetCertificate.
---
 meek-server/certificate.go | 2 +-
 meek-server/meek-server.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meek-server/certificate.go b/meek-server/certificate.go
index 2c57d85..82302db 100644
--- a/meek-server/certificate.go
+++ b/meek-server/certificate.go
@@ -89,7 +89,7 @@ func (ctx *certContext) reloadCertificate() (*tls.Certificate, error) {
 	return cert, nil
 }
 
-func (ctx *certContext) getCertificate(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
+func (ctx *certContext) GetCertificate(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
 	cert, err := ctx.reloadCertificate()
 	if err != nil {
 		// Failure to reload the certificate is a non-fatal error as this
diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go
index eb7adc9..7736615 100644
--- a/meek-server/meek-server.go
+++ b/meek-server/meek-server.go
@@ -279,7 +279,7 @@ func listenTLS(network string, addr *net.TCPAddr, certFilename, keyFilename stri
 
 	// Install a GetCertificate callback that ensures that the certificate is
 	// up to date.
-	config.GetCertificate = ctx.getCertificate
+	config.GetCertificate = ctx.GetCertificate
 
 	conn, err := net.ListenTCP(network, addr)
 	if err != nil {





More information about the tor-commits mailing list