diff options
author | Jakob Unterwurzacher | 2021-09-04 11:58:43 +0200 |
---|---|---|
committer | Jakob Unterwurzacher | 2021-09-07 18:14:05 +0200 |
commit | 8f820c429d88f601ba6c7a614fef23b7f53eb489 (patch) | |
tree | 551b80295c4dd773a785dd008fe90dee2c90332a | |
parent | c9728247edb4cb29755908629528b22c8419a11d (diff) |
stupidgcm: fix without_openssl build
$ ./build-without-openssl.bash
internal/speed/speed.go:152:14: undefined: stupidgcm.NewXchacha20poly1305
-rw-r--r-- | internal/stupidgcm/openssl.go | 2 | ||||
-rw-r--r-- | internal/stupidgcm/without_openssl.go | 28 | ||||
-rw-r--r-- | internal/stupidgcm/xchacha.go | 2 |
3 files changed, 9 insertions, 23 deletions
diff --git a/internal/stupidgcm/openssl.go b/internal/stupidgcm/openssl.go index d57d100..8e1357b 100644 --- a/internal/stupidgcm/openssl.go +++ b/internal/stupidgcm/openssl.go @@ -1,3 +1,5 @@ +// +build !without_openssl + package stupidgcm import ( diff --git a/internal/stupidgcm/without_openssl.go b/internal/stupidgcm/without_openssl.go index 4a14e73..81bae07 100644 --- a/internal/stupidgcm/without_openssl.go +++ b/internal/stupidgcm/without_openssl.go @@ -6,6 +6,8 @@ import ( "fmt" "os" + "crypto/cipher" + "github.com/rfjakob/gocryptfs/v2/internal/exitcodes" ) @@ -21,32 +23,12 @@ func errExit() { os.Exit(exitcodes.OpenSSL) } -func New(_ []byte, _ bool) *StupidGCM { - errExit() - // Never reached - return &StupidGCM{} -} - -func (g *StupidGCM) NonceSize() int { - errExit() - return -1 -} - -func (g *StupidGCM) Overhead() int { - errExit() - return -1 -} - -func (g *StupidGCM) Seal(_, _, _, _ []byte) []byte { +func New(_ []byte, _ bool) cipher.AEAD { errExit() return nil } -func (g *StupidGCM) Open(_, _, _, _ []byte) ([]byte, error) { - errExit() - return nil, nil -} - -func (g *StupidGCM) Wipe() { +func NewXchacha20poly1305(_ []byte) cipher.AEAD { errExit() + return nil } diff --git a/internal/stupidgcm/xchacha.go b/internal/stupidgcm/xchacha.go index d8668dc..eec8852 100644 --- a/internal/stupidgcm/xchacha.go +++ b/internal/stupidgcm/xchacha.go @@ -1,3 +1,5 @@ +// +build !without_openssl + // Copyright 2018 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. |