personal_interest_mirrors/nebula
1
0
Fork 0
mirror of https://github.com/slackhq/nebula.git synced 2026-05-16 04:47:38 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update Makefile

Browse Source
This commit is contained in:
Wade Simmons
2026-05-01 14:13:38 -04:00
parent 441a67fbf9
commit a1b8954a23
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -96,6 +96,8 @@ release-netbsd: $(ALL_NETBSD:%=build/nebula-%.tar.gz)
release-boringcrypto: build/nebula-linux-$(shell go env GOARCH)-boringcrypto.tar.gz release-boringcrypto: build/nebula-linux-$(shell go env GOARCH)-boringcrypto.tar.gz
release-fips140: build/nebula-linux-$(shell go env GOARCH)-fips140.tar.gz
BUILD_ARGS += -trimpath BUILD_ARGS += -trimpath
bin-windows: build/windows-amd64/nebula.exe build/windows-amd64/nebula-cert.exe bin-windows: build/windows-amd64/nebula.exe build/windows-amd64/nebula-cert.exe
@@ -116,6 +118,9 @@ bin-freebsd-arm64: build/freebsd-arm64/nebula build/freebsd-arm64/nebula-cert
bin-boringcrypto: build/linux-$(shell go env GOARCH)-boringcrypto/nebula build/linux-$(shell go env GOARCH)-boringcrypto/nebula-cert bin-boringcrypto: build/linux-$(shell go env GOARCH)-boringcrypto/nebula build/linux-$(shell go env GOARCH)-boringcrypto/nebula-cert
mv $? . mv $? .
bin-fips140: build/linux-$(shell go env GOARCH)-fips140/nebula build/linux-$(shell go env GOARCH)-fips140/nebula-cert
mv $? .
bin-pkcs11: BUILD_ARGS += -tags pkcs11 bin-pkcs11: BUILD_ARGS += -tags pkcs11
bin-pkcs11: CGO_ENABLED = 1 bin-pkcs11: CGO_ENABLED = 1
bin-pkcs11: bin bin-pkcs11: bin
@@ -140,6 +145,18 @@ build/linux-arm64-boringcrypto/%: GOENV += GOEXPERIMENT=boringcrypto CGO_ENABLED
build/linux-amd64-boringcrypto/%: LDFLAGS += -checklinkname=0 build/linux-amd64-boringcrypto/%: LDFLAGS += -checklinkname=0
build/linux-arm64-boringcrypto/%: LDFLAGS += -checklinkname=0 build/linux-arm64-boringcrypto/%: LDFLAGS += -checklinkname=0
# fips140
build/linux-amd64-fips140/%: GOENV += GOFIPS140=v1.0.0
build/linux-amd64-fips140/%: LDFLAGS += -checklinkname=0
build/linux-arm64-fips140/%: GOENV += GOFIPS140=v1.0.0
build/linux-arm64-fips140/%: LDFLAGS += -checklinkname=0
build/darwin-arm64-fips140/%: GOENV += GOFIPS140=v1.0.0
build/darwin-arm64-fips140/%: LDFLAGS += -checklinkname=0
build/windows-amd64-fips140/%: GOENV += GOFIPS140=v1.0.0
build/windows-amd64-fips140/%: LDFLAGS += -checklinkname=0
build/windows-arm64-fips140/%: GOENV += GOFIPS140=v1.0.0
build/windows-arm64-fips140/%: LDFLAGS += -checklinkname=0
build/%/nebula: .FORCE build/%/nebula: .FORCE
GOOS=$(firstword $(subst -, , $*)) \ GOOS=$(firstword $(subst -, , $*)) \
GOARCH=$(word 2, $(subst -, ,$*)) $(GOENV) \ GOARCH=$(word 2, $(subst -, ,$*)) $(GOENV) \
@@ -215,6 +232,10 @@ ifeq ($(words $(MAKECMDGOALS)),1)
@$(MAKE) service ${.DEFAULT_GOAL} --no-print-directory @$(MAKE) service ${.DEFAULT_GOAL} --no-print-directory
endif endif
# Useful to chain together, like:
# - make fips140 e2evv
# - make fips140 smoke-docker
# Use `release-fips140` or `bin-fips140` to build release binaries
fips140: fips140:
@echo > $(NULL_FILE) @echo > $(NULL_FILE)
$(eval GOENV += GOFIPS140=v1.0.0) $(eval GOENV += GOFIPS140=v1.0.0)

2
noise.go
View File

@@ -25,7 +25,7 @@ func NewNebulaCipherState(s *noise.CipherState) *NebulaCipherState {
type cipherAEADDanger interface { type cipherAEADDanger interface {
EncryptDanger(out, ad, plaintext []byte, n uint64, nb []byte) ([]byte, error) EncryptDanger(out, ad, plaintext []byte, n uint64, nb []byte) ([]byte, error)
DecryptDanger(out, ad, plaintext []byte, n uint64, nb []byte) ([]byte, error) DecryptDanger(out, ad, ciphertext []byte, n uint64, nb []byte) ([]byte, error)
} }
// EncryptDanger encrypts and authenticates a given payload. // EncryptDanger encrypts and authenticates a given payload.