stupidgcm: make build tags consistent

This makes building with just CGO_ENABLED=0 work.

12 files changed, 11 insertions, 22 deletions

diff --git a/internal/stupidgcm/chacha.go b/internal/stupidgcm/chacha.go
index de0c2e8..c500ea5 100644
--- a/internal/stupidgcm/chacha.go
+++ b/internal/stupidgcm/chacha.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 package stupidgcm
 
diff --git a/internal/stupidgcm/chacha_test.go b/internal/stupidgcm/chacha_test.go
index 542ff15..356c813 100644
--- a/internal/stupidgcm/chacha_test.go
+++ b/internal/stupidgcm/chacha_test.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 package stupidgcm
 
diff --git a/internal/stupidgcm/common.go b/internal/stupidgcm/common.go
index d88dc62..03698b9 100644
--- a/internal/stupidgcm/common.go
+++ b/internal/stupidgcm/common.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 package stupidgcm
 
diff --git a/internal/stupidgcm/common_test.go b/internal/stupidgcm/common_test.go
index 7f38e90..633f279 100644
--- a/internal/stupidgcm/common_test.go
+++ b/internal/stupidgcm/common_test.go
@@ -1,5 +1,4 @@
 //go:build cgo && !without_openssl
-// +build cgo,!without_openssl
 
 package stupidgcm
 
diff --git a/internal/stupidgcm/gcm.go b/internal/stupidgcm/gcm.go
index 2e5aac4..274d3df 100644
--- a/internal/stupidgcm/gcm.go
+++ b/internal/stupidgcm/gcm.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 package stupidgcm
 
diff --git a/internal/stupidgcm/gcm_test.go b/internal/stupidgcm/gcm_test.go
index c730a87..041dcab 100644
--- a/internal/stupidgcm/gcm_test.go
+++ b/internal/stupidgcm/gcm_test.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 // We compare against Go's built-in GCM implementation. Since stupidgcm only
 // supports 128-bit IVs and Go only supports that from 1.5 onward, we cannot
diff --git a/internal/stupidgcm/locking.go b/internal/stupidgcm/locking.go
index 04cf232..00cc361 100644
--- a/internal/stupidgcm/locking.go
+++ b/internal/stupidgcm/locking.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 package stupidgcm
 
diff --git a/internal/stupidgcm/openssl.go b/internal/stupidgcm/openssl.go
index 8c950f8..3a72f9c 100644
--- a/internal/stupidgcm/openssl.go
+++ b/internal/stupidgcm/openssl.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 package stupidgcm
 
diff --git a/internal/stupidgcm/openssl_aead.c b/internal/stupidgcm/openssl_aead.c
index e02466f..a7f4f59 100644
--- a/internal/stupidgcm/openssl_aead.c
+++ b/internal/stupidgcm/openssl_aead.c
@@ -1,4 +1,4 @@
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 #include "openssl_aead.h"
 #include <openssl/evp.h>
diff --git a/internal/stupidgcm/without_openssl.go b/internal/stupidgcm/without_openssl.go
index fcef793..c59ebe6 100644
--- a/internal/stupidgcm/without_openssl.go
+++ b/internal/stupidgcm/without_openssl.go
@@ -1,5 +1,4 @@
-//go:build without_openssl
-// +build without_openssl
+//go:build !cgo || without_openssl
 
 package stupidgcm
 
diff --git a/internal/stupidgcm/xchacha.go b/internal/stupidgcm/xchacha.go
index 5587e45..cfd69d7 100644
--- a/internal/stupidgcm/xchacha.go
+++ b/internal/stupidgcm/xchacha.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 // Copyright 2018 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/internal/stupidgcm/xchacha_test.go b/internal/stupidgcm/xchacha_test.go
index 676a023..a448f20 100644
--- a/internal/stupidgcm/xchacha_test.go
+++ b/internal/stupidgcm/xchacha_test.go
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 package stupidgcm