From 43eea2a6ff3a3a6735ea152c95daf59b04f49126 Mon Sep 17 00:00:00 2001 From: bill Date: Thu, 19 Apr 2012 23:25:41 -0700 Subject: [PATCH] reorg --- examples/add/README | 4 ++-- examples/add/add.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/add/README b/examples/add/README index f19ed22..26f3efb 100644 --- a/examples/add/README +++ b/examples/add/README @@ -2,10 +2,10 @@ This is a simple add service that happens over a TLS connection. To run the server: - go run add.go + go run add.go --certdir certs To run the client: - go run client/client.go + go run client/client.go --certdir certs To see how certificates can be generated, check out makecert.sh diff --git a/examples/add/add.go b/examples/add/add.go index 55c0c48..d0aa58a 100644 --- a/examples/add/add.go +++ b/examples/add/add.go @@ -2,8 +2,8 @@ package main import ( "crypto/rand" - "crypto/tls" "crypto/rsa" + "crypto/tls" "flag" "log" "net" @@ -11,8 +11,8 @@ import ( "github.com/kylelemons/go-rpcgen/examples/add/addservice" ) -var ( - certDir = flag.String("certdir","certs","The directory to load the X509 certificates from") +var ( + certDir = flag.String("certdir", "certs", "The directory to load the X509 certificates from") ) // Add is the type which will implement the addservice.AddService interface @@ -43,8 +43,8 @@ func handleClient(conn net.Conn) { state := tlscon.ConnectionState() // Note we could reject clients if we don't like their public key. for _, v := range state.PeerCertificates { - log.Printf("Client: Server public key is:\n%x\n",v.PublicKey.(*rsa.PublicKey).N) -// log.Printf("Server: client cert chain %s", v.Subject.ToRDNSequence()) + log.Printf("Client: Server public key is:\n%x\n", v.PublicKey.(*rsa.PublicKey).N) + // log.Printf("Server: client cert chain %s", v.Subject.ToRDNSequence()) } // Now that we have completed SSL/TLS addservice.ServeAddService(tlscon, Add{}) @@ -56,7 +56,7 @@ func serverTLSListen(service string) { // Load x509 certificates for our private/public key, makecert.sh will // generate them for you. - log.Printf("Loading certificates from directory: %s\n",*certDir) + log.Printf("Loading certificates from directory: %s\n", *certDir) cert, err := tls.LoadX509KeyPair(*certDir+"/server.pem", *certDir+"/server.key") if err != nil { log.Fatalf("server: loadkeys: %s", err)