deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate DnD

Browse Source
This commit is contained in:
NIIBE Yutaka
2012-06-15 08:55:09 +09:00
parent 2e5973e7cc
commit 94a65f0d99
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2012-06-15 Niibe Yutaka <gniibe@fsij.org>
* src/configure (--enable-pinpad): Deprecate DND.
2012-06-14 Niibe Yutaka <gniibe@fsij.org> 2012-06-14 Niibe Yutaka <gniibe@fsij.org>
Protection improvement.
* src/openpgp.c (resetcode_s2k): New. * src/openpgp.c (resetcode_s2k): New.
(cmd_reset_user_password): Use resetcode_s2k. (cmd_reset_user_password): Use resetcode_s2k.
* src/openpgp-do.c (proc_resetting_code): Likewise. * src/openpgp-do.c (proc_resetting_code): Likewise.

10
src/configure vendored
View File

@@ -50,8 +50,6 @@ for option; do
debug=yes ;; debug=yes ;;
--disable-debug) --disable-debug)
debug=no ;; debug=no ;;
--enable-pinpad)
pinpad=yes ;;
--enable-pinpad=*) --enable-pinpad=*)
pinpad=$optarg ;; pinpad=$optarg ;;
--disable-pinpad) --disable-pinpad)
@@ -95,7 +93,7 @@ Configuration:
STBEE STBEE
FST_01 FST_01
--enable-debug debug with virtual COM port [no] --enable-debug debug with virtual COM port [no]
--enable-pinpad={dnd,cir,dial} --enable-pinpad={cir,dial}
PIN entry support [no] PIN entry support [no]
--enable-certdo support CERT.3 data object [no] --enable-certdo support CERT.3 data object [no]
--enable-keygen support key generation [no] --enable-keygen support key generation [no]
@@ -175,12 +173,6 @@ if test "$pinpad" = "no"; then
PINPAD_DEFINE="#undef PINPAD_SUPPORT" PINPAD_DEFINE="#undef PINPAD_SUPPORT"
PINPAD_MORE_DEFINE="" PINPAD_MORE_DEFINE=""
echo "PIN pad option disabled" echo "PIN pad option disabled"
elif test "$pinpad" = "yes"; then
pinpad=dnd
PINPAD_MAKE_OPTION="ENABLE_PINPAD=dnd"
PINPAD_DEFINE="#define PINPAD_SUPPORT 1"
PINPAD_MORE_DEFINE="#define PINPAD_DND_SUPPORT 1"
echo "PIN pad option enabled (dnd)"
else else
PINPAD_MAKE_OPTION="ENABLE_PINPAD=$pinpad" PINPAD_MAKE_OPTION="ENABLE_PINPAD=$pinpad"
PINPAD_DEFINE="#define PINPAD_SUPPORT 1" PINPAD_DEFINE="#define PINPAD_SUPPORT 1"