fangdingjun
/
gnutls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use t.Log instead of log.Print

Browse Source
master
fangdingjun 6 years ago
parent 1f6cfb8afc
commit a2891d6cbc
4 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
certificate.go
Unescape Escape View File

@ -33,7 +33,7 @@ func (c *Certificate) Free() {
} }
func (c *Certificate) free() { func (c *Certificate) free() {
log.Println("free certificate") //log.Println("free certificate")
c.Free() c.Free()
} }

21
certificate_test.go
Unescape Escape View File

@ -1,7 +1,6 @@
package gnutls package gnutls
import ( import (
"log"
"runtime" "runtime"
"testing" "testing"
"time" "time"
@ -12,16 +11,16 @@ func TestGetAltname(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
log.Printf("%+v", cert) t.Logf("%+v", cert)
log.Println(cert.GetAltName()) t.Log(cert.GetAltName())
log.Println(cert.GetCertString()) t.Log(cert.GetCertString())
log.Println(cert.GetDN()) t.Log(cert.GetDN())
log.Println(cert.GetIssuerDN()) t.Log(cert.GetIssuerDN())
log.Println("CN ", cert.CommonName()) t.Log("CN ", cert.CommonName())
//log.Println("flag 0: ", cert.getCertString(0, 0)) //t.Log("flag 0: ", cert.getCertString(0, 0))
//log.Println("flag 1: ", cert.getCertString(0, 1)) //t.Log("flag 1: ", cert.getCertString(0, 1))
//log.Println("flag 2: ", cert.getCertString(0, 2)) //t.Log("flag 2: ", cert.getCertString(0, 2))
//log.Println("flag 3: ", cert.getCertString(0, 3)) //t.Log("flag 3: ", cert.getCertString(0, 3))
cert.Free() cert.Free()
} }

3
hash_test.go
Unescape Escape View File

@ -5,7 +5,6 @@ import (
"crypto/rand" "crypto/rand"
"crypto/sha512" "crypto/sha512"
"encoding/hex" "encoding/hex"
"log"
"runtime" "runtime"
"testing" "testing"
"time" "time"
@ -23,7 +22,7 @@ func TestHashSHA(t *testing.T) {
h3.Write(data) h3.Write(data)
h4 := h3.Sum(nil) h4 := h3.Sum(nil)
if !bytes.Equal(h4[:], h1) { if !bytes.Equal(h4[:], h1) {
log.Printf("\n%s\n%s", hex.EncodeToString(h4[:]), hex.EncodeToString(h1)) t.Logf("\n%s\n%s", hex.EncodeToString(h4[:]), hex.EncodeToString(h1))
t.Fatal("hash not equal") t.Fatal("hash not equal")
} }
runtime.GC() runtime.GC()

62
tls_test.go
Unescape Escape View File

@ -6,10 +6,8 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"io" "io"
"log"
"net" "net"
"net/http" "net/http"
"os"
"runtime" "runtime"
"testing" "testing"
"time" "time"
@ -28,21 +26,21 @@ func TestTLSClient(t *testing.T) {
} }
defer l.Close() defer l.Close()
addr := l.Addr().String() addr := l.Addr().String()
log.Println("test server listen on ", addr) t.Log("test server listen on ", addr)
go func() { go func() {
for { for {
c, err := l.Accept() c, err := l.Accept()
if err != nil { if err != nil {
break break
} }
log.Printf("accept connection from %s", c.RemoteAddr()) t.Logf("accept connection from %s", c.RemoteAddr())
go func(c net.Conn) { go func(c net.Conn) {
defer c.Close() defer c.Close()
for { for {
buf := make([]byte, 4096) buf := make([]byte, 4096)
n, err := c.Read(buf) n, err := c.Read(buf)
if err != nil { if err != nil {
log.Println("connection closed") t.Log("connection closed")
break break
} }
if _, err = c.Write(buf[:n]); err != nil { if _, err = c.Write(buf[:n]); err != nil {
@ -85,32 +83,32 @@ func TestTLSServer(t *testing.T) {
t.Fatal("gnutls listen ", err) t.Fatal("gnutls listen ", err)
} }
addr := l.Addr().String() addr := l.Addr().String()
log.Println("test server listen on ", addr) t.Log("test server listen on ", addr)
defer l.Close() defer l.Close()
go func() { go func() {
for { for {
c, err := l.Accept() c, err := l.Accept()
if err != nil { if err != nil {
log.Println("gnutls accept ", err) t.Log("gnutls accept ", err)
break break
} }
log.Println("accept connection from ", c.RemoteAddr()) t.Log("accept connection from ", c.RemoteAddr())
go func(c net.Conn) { go func(c net.Conn) {
defer c.Close() defer c.Close()
tlsconn := c.(*Conn) tlsconn := c.(*Conn)
if err := tlsconn.Handshake(); err != nil { if err := tlsconn.Handshake(); err != nil {
log.Println(err) t.Log(err)
return return
} }
buf := make([]byte, 4096) buf := make([]byte, 4096)
for { for {
n, err := c.Read(buf[0:]) n, err := c.Read(buf[0:])
if err != nil { if err != nil {
log.Println("gnutls read ", err) t.Log("gnutls read ", err)
break break
} }
if _, err := c.Write(buf[:n]); err != nil { if _, err := c.Write(buf[:n]); err != nil {
log.Println("gnutls write ", err) t.Log("gnutls write ", err)
break break
} }
} }
@ -156,34 +154,34 @@ func TestTLSALPNServer(t *testing.T) {
t.Fatal("gnutls listen ", err) t.Fatal("gnutls listen ", err)
} }
addr := l.Addr().String() addr := l.Addr().String()
log.Println("test server listen on ", addr) t.Log("test server listen on ", addr)
defer l.Close() defer l.Close()
go func() { go func() {
for { for {
c, err := l.Accept() c, err := l.Accept()
if err != nil { if err != nil {
log.Println("gnutls accept ", err) t.Log("gnutls accept ", err)
break break
} }
log.Println("accept connection from ", c.RemoteAddr()) t.Log("accept connection from ", c.RemoteAddr())
go func(c net.Conn) { go func(c net.Conn) {
defer c.Close() defer c.Close()
tlsConn := c.(*Conn) tlsConn := c.(*Conn)
if err := tlsConn.Handshake(); err != nil { if err := tlsConn.Handshake(); err != nil {
log.Println(err) t.Log(err)
return return
} }
connState := tlsConn.ConnectionState() connState := tlsConn.ConnectionState()
log.Printf("%+v", connState) t.Logf("%+v", connState)
buf := make([]byte, 4096) buf := make([]byte, 4096)
for { for {
n, err := c.Read(buf[0:]) n, err := c.Read(buf[0:])
if err != nil { if err != nil {
log.Println("gnutls read ", err) t.Log("gnutls read ", err)
break break
} }
if _, err := c.Write(buf[:n]); err != nil { if _, err := c.Write(buf[:n]); err != nil {
log.Println("gnutls write ", err) t.Log("gnutls write ", err)
break break
} }
} }
@ -205,7 +203,7 @@ func TestTLSALPNServer(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
connState := c.ConnectionState() connState := c.ConnectionState()
log.Printf("%+v", connState) t.Logf("%+v", connState)
if connState.NegotiatedProtocol != expectedAlpn { if connState.NegotiatedProtocol != expectedAlpn {
t.Errorf("expected alpn %s, got %s", t.Errorf("expected alpn %s, got %s",
@ -247,34 +245,34 @@ func TestTLSALPNClient(t *testing.T) {
t.Fatal("tls listen ", err) t.Fatal("tls listen ", err)
} }
addr := l.Addr().String() addr := l.Addr().String()
log.Println("test server listen on ", addr) t.Log("test server listen on ", addr)
defer l.Close() defer l.Close()
go func() { go func() {
for { for {
c, err := l.Accept() c, err := l.Accept()
if err != nil { if err != nil {
log.Println("gnutls accept ", err) t.Log("gnutls accept ", err)
break break
} }
log.Println("accept connection from ", c.RemoteAddr()) t.Log("accept connection from ", c.RemoteAddr())
go func(c net.Conn) { go func(c net.Conn) {
defer c.Close() defer c.Close()
tlsConn := c.(*tls.Conn) tlsConn := c.(*tls.Conn)
if err := tlsConn.Handshake(); err != nil { if err := tlsConn.Handshake(); err != nil {
log.Println(err) t.Log(err)
return return
} }
connState := tlsConn.ConnectionState() connState := tlsConn.ConnectionState()
log.Printf("%+v", connState) t.Logf("%+v", connState)
buf := make([]byte, 4096) buf := make([]byte, 4096)
for { for {
n, err := c.Read(buf[0:]) n, err := c.Read(buf[0:])
if err != nil { if err != nil {
log.Println("tls read ", err) t.Log("tls read ", err)
break break
} }
if _, err := c.Write(buf[:n]); err != nil { if _, err := c.Write(buf[:n]); err != nil {
log.Println("tls write ", err) t.Log("tls write ", err)
break break
} }
} }
@ -295,7 +293,7 @@ func TestTLSALPNClient(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
connState := c.ConnectionState() connState := c.ConnectionState()
log.Printf("%+v", connState) t.Logf("%+v", connState)
if connState.NegotiatedProtocol != expectedAlpn { if connState.NegotiatedProtocol != expectedAlpn {
t.Errorf("expected alpn %s, got %s", t.Errorf("expected alpn %s, got %s",
@ -350,14 +348,14 @@ func TestTLSServerSNI(t *testing.T) {
for { for {
c, err := l.Accept() c, err := l.Accept()
if err != nil { if err != nil {
log.Println(err) t.Log(err)
break break
} }
go func(c net.Conn) { go func(c net.Conn) {
defer c.Close() defer c.Close()
tlsconn := c.(*Conn) tlsconn := c.(*Conn)
if err := tlsconn.Handshake(); err != nil { if err := tlsconn.Handshake(); err != nil {
log.Println(err) t.Log(err)
return return
} }
state := tlsconn.ConnectionState() state := tlsconn.ConnectionState()
@ -415,7 +413,7 @@ func TestTLSGetPeerCert(t *testing.T) {
} }
state := conn.ConnectionState() state := conn.ConnectionState()
for i := 0; i < int(state.PeerCertificate.certSize); i++ { for i := 0; i < int(state.PeerCertificate.certSize); i++ {
log.Println(state.PeerCertificate.getCertString(i, 1)) t.Log(state.PeerCertificate.getCertString(i, 1))
} }
req, _ := http.NewRequest("GET", "https://www.ratafee.nl/httpbin/ip", nil) req, _ := http.NewRequest("GET", "https://www.ratafee.nl/httpbin/ip", nil)
@ -425,7 +423,9 @@ func TestTLSGetPeerCert(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
resp.Write(os.Stdout) var buf = new(bytes.Buffer)
resp.Write(buf)
t.Logf("%s", string(buf.Bytes()))
runtime.GC() runtime.GC()
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }

Write Preview
Loading…
Cancel
Save