stupidgcm: make build tags consistent

rfjakob · rfjakob · commit 5f324fe6614c · 2025-08-07T22:06:39.000+02:00
This makes building with just CGO_ENABLED=0 work.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
-//go:build !without_openssl
-// +build !without_openssl
+//go:build cgo && !without_openssl
 
 package stupidgcm
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build cgo && !without_openssl`
`2`		`-// +build cgo,!without_openssl`
`3`	`2`
`4`	`3`	`package stupidgcm`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !without_openssl`
	`1`	`+//go:build cgo && !without_openssl`
`2`	`2`
`3`	`3`	`#include "openssl_aead.h"`
`4`	`4`	`#include <openssl/evp.h>`