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

some cosmetic changes

Browse Source
This commit is contained in:
NIIBE Yutaka
2011-01-27 15:09:59 +09:00
parent 1d2439abca
commit f59637700a
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,6 +1,9 @@
2011-01-27 NIIBE Yutaka <gniibe@fsij.org> 2011-01-27 NIIBE Yutaka <gniibe@fsij.org>
* src/openpgp.c (cmd_reset_user_password): Added PINPAD_SUPPORT. * src/openpgp-do.c (gpg_do_table): Exclude GPG_DO_CH_CERTIFICATE
for now.
* src/openpgp.c (cmd_reset_user_password): Add PINPAD_SUPPORT.
* src/gnuk.ld.in: Fix alignment and filling. * src/gnuk.ld.in: Fix alignment and filling.

2
NEWS
View File

@@ -5,7 +5,7 @@ Gnuk NEWS - User visible changes
Released 2011-01-XX, by NIIBE Yutaka Released 2011-01-XX, by NIIBE Yutaka
** Better interoperability to OpenSC. ** Better interoperability to OpenSC.
Gnuk is not yet supported by OpenSC, but it should be. With the Gnuk is not yet supported by OpenSC, but it could be. With the
changes in Gnuk, it could be relatively easily possible to support changes in Gnuk, it could be relatively easily possible to support
Gnuk Token by OpenSC with a few changes to libopensc/card-openpgp.c, Gnuk Token by OpenSC with a few changes to libopensc/card-openpgp.c,
and libopensc/pkcs15-openpgp.c. and libopensc/pkcs15-openpgp.c.

10
src/openpgp-do.c
View File

@@ -1,7 +1,7 @@
/* /*
* openpgp-do.c -- OpenPGP card Data Objects (DO) handling * openpgp-do.c -- OpenPGP card Data Objects (DO) handling
* *
* Copyright (C) 2010 Free Software Initiative of Japan * Copyright (C) 2010, 2011 Free Software Initiative of Japan
* Author: NIIBE Yutaka <gniibe@fsij.org> * Author: NIIBE Yutaka <gniibe@fsij.org>
* *
* This file is a part of Gnuk, a GnuPG USB Token implementation. * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -928,8 +928,10 @@ gpg_do_table[] = {
/* Compound data: Write access only */ /* Compound data: Write access only */
{ GPG_DO_KEY_IMPORT, DO_PROC_WRITE, AC_NEVER, AC_ADMIN_AUTHORIZED, { GPG_DO_KEY_IMPORT, DO_PROC_WRITE, AC_NEVER, AC_ADMIN_AUTHORIZED,
proc_key_import }, proc_key_import },
#if 0
/* Card holder certificate: Not supported yet */ /* Card holder certificate: Not supported yet */
{ GPG_DO_CH_CERTIFICATE, DO_PROC_READWRITE, AC_NEVER, AC_NEVER, NULL }, { GPG_DO_CH_CERTIFICATE, DO_PROC_READWRITE, AC_NEVER, AC_NEVER, NULL },
#endif
}; };
#define NUM_DO_ENTRIES (int)(sizeof (gpg_do_table) \ #define NUM_DO_ENTRIES (int)(sizeof (gpg_do_table) \
@@ -1218,7 +1220,7 @@ gpg_do_get_data (uint16_t tag, int with_tag)
} }
} }
else else
GPG_NO_RECORD(); GPG_NO_RECORD ();
} }
void void
@@ -1298,7 +1300,7 @@ gpg_do_put_data (uint16_t tag, const uint8_t *data, int len)
} }
} }
else else
GPG_NO_RECORD(); GPG_NO_RECORD ();
} }
void void
@@ -1320,7 +1322,7 @@ gpg_do_public_key (uint8_t kk_byte)
if (do_data == NULL) if (do_data == NULL)
{ {
DEBUG_INFO ("none.\r\n"); DEBUG_INFO ("none.\r\n");
GPG_NO_RECORD(); GPG_NO_RECORD ();
return; return;
} }

2
src/usb_prop.c
View File

@@ -1,7 +1,7 @@
/* /*
* usb_prop.c - glue/interface code between Gnuk and USB-FS-Device_Lib * usb_prop.c - glue/interface code between Gnuk and USB-FS-Device_Lib
* *
* Copyright (C) 2010 Free Software Initiative of Japan * Copyright (C) 2010, 2011 Free Software Initiative of Japan
* Author: NIIBE Yutaka <gniibe@fsij.org> * Author: NIIBE Yutaka <gniibe@fsij.org>
* *
* This file is a part of Gnuk, a GnuPG USB Token implementation. * This file is a part of Gnuk, a GnuPG USB Token implementation.