Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix-webauthn #211

Merged
merged 2 commits into from
Mar 11, 2024
Merged

fix-webauthn #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d38fc2
fix-webauthn
cviecco Mar 8, 2024
7327c8c
cleanup
cviecco Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,27 @@ BINARY=keymaster
VERSION=1.15.0
#BUILD_TIME=`date +%FT%T%z`

# keymaster client requires special tags on linux
#EXTRA_BUILD_FLAGS
ifneq ($(OS),Windows_NT)
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
EXTRA_BUILD_FLAGS+= -tags=hidraw
endif
endif


# Setup the -ldflags option for go build here, interpolate the variable values
#LDFLAGS=-ldflags "-X github.com/ariejan/roll/core.Version=${VERSION} -X github.com/ariejan/roll/core.BuildTime=${BUILD_TIME}"

all: init-config-host cmd/keymasterd/binData.go
cd cmd/keymaster; go install -ldflags "-X main.Version=${VERSION}"
cd cmd/keymaster; go install ${EXTRA_BUILD_FLAGS} -ldflags "-X main.Version=${VERSION}"
cd cmd/keymasterd; go install -ldflags "-X main.Version=${VERSION}"
cd cmd/keymaster-unlocker; go install -ldflags "-X main.Version=${VERSION}"
cd cmd/keymaster-eventmond; go install -ldflags "-X main.Version=${VERSION}"

build: cmd/keymasterd/binData.go
go build -ldflags "-X main.Version=${VERSION}" -o bin/ ./...
go build ${EXTRA_BUILD_FLAGS} -ldflags "-X main.Version=${VERSION}" -o bin/ ./...

cmd/keymasterd/binData.go:
-go-bindata -fs -o cmd/keymasterd/binData.go -prefix cmd/keymasterd/data cmd/keymasterd/data/...
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ Pre-build binaries (both RPM and DEB) can be found here: [releases page](https:/
* make
* gcc

In addition for linux you will also need:
* pkg-config
* libudev-dev

For Windows (both gcc and gnu-make) use: [TDM-GCC (64 bit)](https://sourceforge.net/projects/tdm-gcc/). Recent windows builds fail when using TDM-GCC 5.x. Successful builds are known with golang 1.16.X and gcc 10.X.

#### Building
Expand Down
2 changes: 1 addition & 1 deletion keymaster.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: keymaster
Version: 1.15.0
Version: 1.15.1
Release: 1%{?dist}
Summary: Short term access certificate generator and client

Expand Down
3 changes: 0 additions & 3 deletions lib/client/twofa/twofa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,6 @@ func tryFidoMFA(
// The env variable allows us to swap what library is used by
// default
useWebAuthh := true
if runtime.GOOS == "linux" {
useWebAuthh = false
}
if os.Getenv("KEYMASTER_USEALTU2FLIB") != "" {
useWebAuthh = !useWebAuthh
}
Expand Down
Loading