forked from Yubico/yubikey-personalization
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
onlykey
authored and
onlykey
committed
Feb 27, 2019
1 parent
07b47c5
commit 19ce294
Showing
58 changed files
with
2,083 additions
and
2,083 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ Patches | |
------- | ||
|
||
Lester Hightower, 10East" <[email protected]> | ||
Added ykp_AES_key_from_hex and ykpersonalize -a parameter. | ||
Added okp_AES_key_from_hex and okpersonalize -a parameter. | ||
|
||
Christer Kaivo-oja <[email protected]> | ||
Mac OS X port. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
# Written by Richard Levitte <[email protected]> et al. | ||
# Copyright (c) 2008-2014 Yubico AB | ||
# All rights reserved. | ||
# | ||
# | ||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are | ||
# met: | ||
# | ||
# | ||
# * Redistributions of source code must retain the above copyright | ||
# notice, this list of conditions and the following disclaimer. | ||
# | ||
# | ||
# * Redistributions in binary form must reproduce the above | ||
# copyright notice, this list of conditions and the following | ||
# disclaimer in the documentation and/or other materials provided | ||
# with the distribution. | ||
# | ||
# | ||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
|
@@ -28,71 +28,71 @@ | |
|
||
# Subdirectories | ||
|
||
SUBDIRS= ykcore . tests | ||
SUBDIRS= okcore . tests | ||
|
||
ACLOCAL_AMFLAGS = -I m4 | ||
|
||
AM_CPPFLAGS = -I$(srcdir)/ykcore | ||
AM_CPPFLAGS = -I$(srcdir)/okcore | ||
AM_CFLAGS = $(WARN_CFLAGS) | ||
|
||
AM_CFLAGS += $(libjson_CFLAGS) | ||
|
||
# The library. | ||
|
||
ykpers_includedir=$(includedir)/ykpers-1 | ||
ykpers_include_HEADERS = ykpers.h ykpers-version.h | ||
ykpers_include_HEADERS += ykcore/ykstatus.h ykcore/ykcore.h ykcore/ykdef.h | ||
ykpers_include_HEADERS += ykpbkdf2.h | ||
okpers_includedir=$(includedir)/okpers-1 | ||
okpers_include_HEADERS = okpers.h okpers-version.h | ||
okpers_include_HEADERS += okcore/okstatus.h okcore/okcore.h okcore/okdef.h | ||
okpers_include_HEADERS += okpbkdf2.h | ||
|
||
noinst_LTLIBRARIES = libhmac.la | ||
libhmac_la_SOURCES = hmac.c usha.c sha.h sha1.c sha224-256.c | ||
libhmac_la_SOURCES += sha384-512.c sha-private.h | ||
libhmac_la_CFLAGS = | ||
|
||
lib_LTLIBRARIES = libykpers-1.la | ||
libykpers_1_la_SOURCES = ykpers.c ykpers-version.c ykpbkdf2.c | ||
lib_LTLIBRARIES = libokpers-1.la | ||
libokpers_1_la_SOURCES = okpers.c okpers-version.c okpbkdf2.c | ||
if JSON | ||
libykpers_1_la_SOURCES += ykpers-json.c | ||
libokpers_1_la_SOURCES += okpers-json.c | ||
else | ||
libykpers_1_la_SOURCES += ykpers-nojson.c | ||
libokpers_1_la_SOURCES += okpers-nojson.c | ||
endif | ||
libykpers_1_la_SOURCES += ykpers_lcl.h ykpers-json.h ykpers_lcl.c | ||
libykpers_1_la_SOURCES += ykpers-1.pc.in libykpers-1.map | ||
libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la ./libhmac.la $(libjson_LIBS) | ||
libykpers_1_la_LDFLAGS = -no-undefined \ | ||
libokpers_1_la_SOURCES += okpers_lcl.h okpers-json.h okpers_lcl.c | ||
libokpers_1_la_SOURCES += okpers-1.pc.in libokpers-1.map | ||
libokpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./okcore/libokcore.la ./libhmac.la $(libjson_LIBS) | ||
libokpers_1_la_LDFLAGS = -no-undefined \ | ||
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) | ||
EXTRA_libykpers_1_la_DEPENDENCIES = libykpers-1.map | ||
EXTRA_libokpers_1_la_DEPENDENCIES = libokpers-1.map | ||
|
||
pkgconfigdir = $(libdir)/pkgconfig | ||
pkgconfig_DATA = ykpers-1.pc | ||
pkgconfig_DATA = okpers-1.pc | ||
|
||
if HAVE_LD_VERSION_SCRIPT | ||
libykpers_1_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libykpers-1.map | ||
libokpers_1_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libokpers-1.map | ||
else | ||
libykpers_1_la_LDFLAGS += -export-symbols-regex '^(ykp|yk|ykds|ykpers)_.*|_yk.*_errno_location' | ||
libokpers_1_la_LDFLAGS += -export-symbols-regex '^(okp|ok|okds|okpers)_.*|_ok.*_errno_location' | ||
endif | ||
|
||
# The command line tools. | ||
|
||
bin_PROGRAMS = ykpersonalize ykchalresp ykinfo | ||
bin_PROGRAMS = okpersonalize okchalresp okinfo | ||
|
||
ykpersonalize_SOURCES = ykpersonalize.c | ||
ykpersonalize_LDADD = ./libykpers-1.la | ||
ykpersonalize_LDADD += ./libykpers_args.la | ||
okpersonalize_SOURCES = okpersonalize.c | ||
okpersonalize_LDADD = ./libokpers-1.la | ||
okpersonalize_LDADD += ./libokpers_args.la | ||
|
||
noinst_LTLIBRARIES += libykpers_args.la | ||
libykpers_args_la_SOURCES = ykpers-args.c ykpers-args.h | ||
libykpers_args_la_LIBADD = libykpers-1.la $(LTLIBYUBIKEY) | ||
noinst_LTLIBRARIES += libokpers_args.la | ||
libokpers_args_la_SOURCES = okpers-args.c okpers-args.h | ||
libokpers_args_la_LIBADD = libokpers-1.la $(LTLIBYUBIKEY) | ||
|
||
ykchalresp_SOURCES = ykchalresp.c | ||
ykchalresp_LDADD = ./libykpers-1.la $(LTLIBYUBIKEY) | ||
okchalresp_SOURCES = okchalresp.c | ||
okchalresp_LDADD = ./libokpers-1.la $(LTLIBYUBIKEY) | ||
|
||
ykinfo_SOURCES = ykinfo.c | ||
ykinfo_LDADD = ./libykpers-1.la $(LTLIBYUBIKEY) | ||
okinfo_SOURCES = okinfo.c | ||
okinfo_LDADD = ./libokpers-1.la $(LTLIBYUBIKEY) | ||
|
||
dist_man1_MANS = ykpersonalize.1 ykchalresp.1 ykinfo.1 | ||
dist_man1_MANS = okpersonalize.1 okchalresp.1 okinfo.1 | ||
DISTCLEANFILES = $(dist_man1_MANS) | ||
MANSOURCES = ykpersonalize.1.adoc ykchalresp.1.adoc ykinfo.1.adoc | ||
MANSOURCES = okpersonalize.1.adoc okchalresp.1.adoc okinfo.1.adoc | ||
SUFFIXES = .1.adoc .1 | ||
.1.adoc.1: | ||
$(A2X) -L --format=manpage -a revdate="Version $(VERSION)" --xsltproc-opts="--nonet" $< | ||
|
@@ -104,7 +104,7 @@ EXTRA_DIST = doc/Compatibility.asciidoc doc/USB-Hid-Issue.asciidoc | |
EXTRA_DIST += contrib/README contrib/programming.sh contrib/oath-unlock-reprogram.sh contrib/draft-josefsson-yubikey-config.xml | ||
|
||
# Windows rules. | ||
EXTRA_DIST += ykpers4win.mk ykpers4mac.mk | ||
EXTRA_DIST += okpers4win.mk okpers4mac.mk | ||
|
||
# Dist dev tools as well, to have the tarball complete. | ||
EXTRA_DIST += build-and-test.sh .travis.yml .gitignore | ||
|
Oops, something went wrong.