From 6a8b9d8aa337636e4deb8e92ab077ac97db07f43 Mon Sep 17 00:00:00 2001 From: Torben Hohn Date: Fri, 15 May 2020 11:08:32 +0200 Subject: [PATCH 1/2] logging: remove the logger The logger implementation from spacemonkeygo uses reflect, which increases binary size massively. Binary size is reduced from 9MB to 7MB for mender, which is quite a lot on an embedded target. Remove all references to github.com/spacemonkeygo/spacelog. Signed-off-by: Torben Hohn Reviewed-by: Bastian Germann --- bio.go | 4 ---- ctx.go | 5 ----- ssl.go | 2 -- tickets.go | 1 - 4 files changed, 12 deletions(-) diff --git a/bio.go b/bio.go index 9fe32aa8..5fb12608 100644 --- a/bio.go +++ b/bio.go @@ -68,7 +68,6 @@ func bioSetRetryRead(b *C.BIO) { func go_write_bio_write(b *C.BIO, data *C.char, size C.int) (rc C.int) { defer func() { if err := recover(); err != nil { - logger.Critf("openssl: writeBioWrite panic'd: %v", err) rc = -1 } }() @@ -88,7 +87,6 @@ func go_write_bio_ctrl(b *C.BIO, cmd C.int, arg1 C.long, arg2 unsafe.Pointer) ( rc C.long) { defer func() { if err := recover(); err != nil { - logger.Critf("openssl: writeBioCtrl panic'd: %v", err) rc = -1 } }() @@ -169,7 +167,6 @@ func loadReadPtr(b *C.BIO) *readBio { func go_read_bio_read(b *C.BIO, data *C.char, size C.int) (rc C.int) { defer func() { if err := recover(); err != nil { - logger.Critf("openssl: go_read_bio_read panic'd: %v", err) rc = -1 } }() @@ -204,7 +201,6 @@ func go_read_bio_ctrl(b *C.BIO, cmd C.int, arg1 C.long, arg2 unsafe.Pointer) ( defer func() { if err := recover(); err != nil { - logger.Critf("openssl: readBioCtrl panic'd: %v", err) rc = -1 } }() diff --git a/ctx.go b/ctx.go index 33befc40..f2d7b9c8 100644 --- a/ctx.go +++ b/ctx.go @@ -26,14 +26,10 @@ import ( "sync" "time" "unsafe" - - "github.com/spacemonkeygo/spacelog" ) var ( ssl_ctx_idx = C.X_SSL_CTX_new_index() - - logger = spacelog.GetLogger() ) type Ctx struct { @@ -426,7 +422,6 @@ type VerifyCallback func(ok bool, store *CertificateStoreCtx) bool func go_ssl_ctx_verify_cb_thunk(p unsafe.Pointer, ok C.int, ctx *C.X509_STORE_CTX) C.int { defer func() { if err := recover(); err != nil { - logger.Critf("openssl: verify callback panic'd: %v", err) os.Exit(1) } }() diff --git a/ssl.go b/ssl.go index 117c30c0..ae692efa 100644 --- a/ssl.go +++ b/ssl.go @@ -49,7 +49,6 @@ type SSL struct { func go_ssl_verify_cb_thunk(p unsafe.Pointer, ok C.int, ctx *C.X509_STORE_CTX) C.int { defer func() { if err := recover(); err != nil { - logger.Critf("openssl: verify callback panic'd: %v", err) os.Exit(1) } }() @@ -154,7 +153,6 @@ func (s *SSL) SetSSLCtx(ctx *Ctx) { func sni_cb_thunk(p unsafe.Pointer, con *C.SSL, ad unsafe.Pointer, arg unsafe.Pointer) C.int { defer func() { if err := recover(); err != nil { - logger.Critf("openssl: verify callback sni panic'd: %v", err) os.Exit(1) } }() diff --git a/tickets.go b/tickets.go index a064d385..cf793de7 100644 --- a/tickets.go +++ b/tickets.go @@ -122,7 +122,6 @@ func go_ticket_key_cb_thunk(p unsafe.Pointer, s *C.SSL, key_name *C.uchar, // so just abort everything. defer func() { if err := recover(); err != nil { - logger.Critf("openssl: ticket key callback panic'd: %v", err) os.Exit(1) } }() From b3c800c89e9dbfa6ae096cad7ab9e4dde8a5ec6c Mon Sep 17 00:00:00 2001 From: Torben Hohn Date: Fri, 15 May 2020 13:46:26 +0200 Subject: [PATCH 2/2] go.mod: drop dependency to spacelog spacelog is not needed anymore. Remove it from the go module files. Signed-off-by: Torben Hohn Reviewed-by: Bastian Germann --- go.mod | 2 -- go.sum | 2 -- 2 files changed, 4 deletions(-) diff --git a/go.mod b/go.mod index 73f3bbfe..a96a15a1 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1 @@ module github.com/spacemonkeygo/openssl - -require github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 diff --git a/go.sum b/go.sum index 1b0ecc56..e69de29b 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +0,0 @@ -github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU= -github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=