security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

* README: Mentioned --enable-selinux-support.

Browse Source 
* status.h (STATUS_NEED_PASSPHRASE_PIN): New.
* status.c (get_status_string): Added.
* passphrase.c (ask_passphrase): Moved status printing to ..
* cardglue.c (pin_cb): .. here and issue new status message.

* keyedit.c (sign_uids): Don't include the leading LF in the
translatable string but print them separately.

* apdu.c (apdu_open_remote_reader) [_WIN32]: We don't have ENOSYS.
This commit is contained in:
Werner Koch 2004-10-15 13:16:58 +00:00
parent e170c54cf8
commit c3a51cd17d
13 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-10-15 Werner Koch <wk@g10code.com>
Released 1.3.91.
* README: Mentioned --enable-selinux-support.
2004-10-15 David Shaw <dshaw@jabberwocky.com> 2004-10-15 David Shaw <dshaw@jabberwocky.com>
* NEWS: Note gpgkeys_finger, keyserver timeouts, and the direct * NEWS: Note gpgkeys_finger, keyserver timeouts, and the direct

2
NEWS
View File

@ -1,4 +1,4 @@
Noteworthy changes in version 1.3.91 Noteworthy changes in version 1.3.91 (2004-10-15)
------------------------------------------------- -------------------------------------------------
* A new configure option --enable-selinux-support disallows * A new configure option --enable-selinux-support disallows

6
README
View File

@ -1,7 +1,7 @@
GnuPG - The GNU Privacy Guard GnuPG - The GNU Privacy Guard
------------------------------- -------------------------------
Version 1.3.90 Version 1.3.91
Copyright 1998, 1999, 2000, 2001, 2002, 2003, Copyright 1998, 1999, 2000, 2001, 2002, 2003,
2004 Free Software Foundation, Inc. 2004 Free Software Foundation, Inc.
@ -601,6 +601,10 @@
to include support if all required libraries are to include support if all required libraries are
available. available.
--enable-selinux-support
This prevents access to certain files and won't
allow import or export of secret keys.
Installation Problems Installation Problems
--------------------- ---------------------

2
configure.ac
View File

@ -26,7 +26,7 @@ min_automake_version="1.7.9"
# Remember to change the version number immediately *after* a release # Remember to change the version number immediately *after* a release
# and remove the "-cvs" or "rc" suffix immediately *before* a release. # and remove the "-cvs" or "rc" suffix immediately *before* a release.
AC_INIT(gnupg, 1.3.91-cvs, bug-gnupg@gnu.org) AC_INIT(gnupg, 1.3.91, bug-gnupg@gnu.org)
# Set development_version to yes if the minor number is odd or you # Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not # feel that the default check for a development version is not
# sufficient. # sufficient.

5
doc/DETAILS
View File

@ -330,6 +330,9 @@ more arguments in future versions.
NEED_PASSPHRASE_SYM <cipher_algo> <s2k_mode> <s2k_hash> NEED_PASSPHRASE_SYM <cipher_algo> <s2k_mode> <s2k_hash>
Issued whenever a passphrase for symmetric encryption is needed. Issued whenever a passphrase for symmetric encryption is needed.
NEED_PASSPHRASE_PIN <card_type> <chvno>
Issued whenever a PIN is requested to unlock a card.
MISSING_PASSPHRASE MISSING_PASSPHRASE
No passphrase was supplied. An application which encounters this No passphrase was supplied. An application which encounters this
message may want to stop parsing immediately because the next message message may want to stop parsing immediately because the next message
@ -535,7 +538,7 @@ more arguments in future versions.
0x02 = this attribute packet is revoked 0x02 = this attribute packet is revoked
0x04 = this attribute packet is expired 0x04 = this attribute packet is expired
STATUSCTRL <what> [<serialno>] CARDCTRL <what> [<serialno>]
This is used to control smartcard operations. This is used to control smartcard operations.
Defined values for WHAT are: Defined values for WHAT are:
1 = Request insertion of a card. Serialnumber may be given 1 = Request insertion of a card. Serialnumber may be given

10
g10/ChangeLog
View File

@ -1,5 +1,15 @@
2004-10-15 Werner Koch <wk@g10code.com> 2004-10-15 Werner Koch <wk@g10code.com>
* status.h (STATUS_NEED_PASSPHRASE_PIN): New.
* status.c (get_status_string): Added.
* passphrase.c (ask_passphrase): Moved status printing to ..
* cardglue.c (pin_cb): .. here and issue new status message.
* keyedit.c (sign_uids): Don't include the leading LF in the
translatable string but print them separately.
* apdu.c (apdu_open_remote_reader) [_WIN32]: We don't have ENOSYS.
* app-openpgp.c (parse_login_data): New. * app-openpgp.c (parse_login_data): New.
(app_select_openpgp): Call it. (app_select_openpgp): Call it.
(do_setattr): Reparse it after change. (do_setattr): Reparse it after change.

8
g10/apdu.c
View File

@ -16,6 +16,8 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
* $Id$
*/ */
#include <config.h> #include <config.h>
@ -2047,9 +2049,11 @@ apdu_open_remote_reader (const char *portstr,
writefnc, writefnc_value, writefnc, writefnc_value,
closefnc, closefnc_value); closefnc, closefnc_value);
#else #else
#ifndef _WIN32 #ifdef _WIN32
errno = ENOENT;
#else
errno = ENOSYS; errno = ENOSYS;
#endif #endif
return -1; return -1;
#endif #endif
} }

4
g10/cardglue.c
View File

@ -628,6 +628,10 @@ pin_cb (void *opaque, const char *info, char **retstr)
*retstr = NULL; *retstr = NULL;
log_debug ("asking for PIN '%s'\n", info); log_debug ("asking for PIN '%s'\n", info);
if (is_status_enabled())
write_status_text (STATUS_NEED_PASSPHRASE_PIN,
isadmin? "OPENPGP 3" : "OPENPGP 1");
value = ask_passphrase (info, value = ask_passphrase (info,
isadmin? "passphrase.adminpin.ask" isadmin? "passphrase.adminpin.ask"
: "passphrase.pin.ask", : "passphrase.pin.ask",

2
g10/ccid-driver.c
View File

@ -51,6 +51,8 @@
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
*/ */

40
g10/keyedit.c
View File

@ -921,40 +921,56 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
if(selfsig) if(selfsig)
{ {
tty_printf(_("\nThis will be a self-signature.\n")); tty_printf("\n");
tty_printf(_("This will be a self-signature.\n"));
if( local ) if( local )
tty_printf( {
_("\nWARNING: the signature will not be marked " tty_printf("\n");
tty_printf(
_("WARNING: the signature will not be marked "
"as non-exportable.\n")); "as non-exportable.\n"));
}
if( nonrevocable ) if( nonrevocable )
tty_printf( {
_("\nWARNING: the signature will not be marked " tty_printf("\n");
tty_printf(
_("WARNING: the signature will not be marked "
"as non-revocable.\n")); "as non-revocable.\n"));
}
} }
else else
{ {
if( local ) if( local )
tty_printf( {
_("\nThe signature will be marked as non-exportable.\n")); tty_printf("\n");
tty_printf(
_("The signature will be marked as non-exportable.\n"));
}
if( nonrevocable ) if( nonrevocable )
tty_printf( {
_("\nThe signature will be marked as non-revocable.\n")); tty_printf("\n");
tty_printf(
_("The signature will be marked as non-revocable.\n"));
}
switch(class) switch(class)
{ {
case 0x11: case 0x11:
tty_printf(_("\nI have not checked this key at all.\n")); tty_printf("\n");
tty_printf(_("I have not checked this key at all.\n"));
break; break;
case 0x12: case 0x12:
tty_printf(_("\nI have checked this key casually.\n")); tty_printf("\n");
tty_printf(_("I have checked this key casually.\n"));
break; break;
case 0x13: case 0x13:
tty_printf(_("\nI have checked this key very carefully.\n")); tty_printf("\n");
tty_printf(_("I have checked this key very carefully.\n"));
break; break;
} }
} }

3
g10/passphrase.c
View File

@ -1025,9 +1025,6 @@ ask_passphrase (const char *description,
if (canceled) if (canceled)
*canceled = 0; *canceled = 0;
if (is_status_enabled())
write_status_text( STATUS_NEED_PASSPHRASE_SYM, "0 0 0");
if (!opt.batch && description) if (!opt.batch && description)
tty_printf ("\n%s\n",description); tty_printf ("\n%s\n",description);

1
g10/status.c
View File

@ -114,6 +114,7 @@ get_status_string ( int no )
case STATUS_NO_PUBKEY : s = "NO_PUBKEY"; break; case STATUS_NO_PUBKEY : s = "NO_PUBKEY"; break;
case STATUS_NO_SECKEY : s = "NO_SECKEY"; break; case STATUS_NO_SECKEY : s = "NO_SECKEY"; break;
case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM"; break; case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM"; break;
case STATUS_NEED_PASSPHRASE_PIN: s = "NEED_PASSPHRASE_PIN"; break;
case STATUS_DECRYPTION_FAILED: s = "DECRYPTION_FAILED"; break; case STATUS_DECRYPTION_FAILED: s = "DECRYPTION_FAILED"; break;
case STATUS_DECRYPTION_OKAY: s = "DECRYPTION_OKAY"; break; case STATUS_DECRYPTION_OKAY: s = "DECRYPTION_OKAY"; break;
case STATUS_MISSING_PASSPHRASE: s = "MISSING_PASSPHRASE"; break; case STATUS_MISSING_PASSPHRASE: s = "MISSING_PASSPHRASE"; break;

1
g10/status.h
View File

@ -104,6 +104,7 @@
#define STATUS_PLAINTEXT 73 #define STATUS_PLAINTEXT 73
#define STATUS_PLAINTEXT_LENGTH 74 #define STATUS_PLAINTEXT_LENGTH 74
#define STATUS_KEY_NOT_CREATED 75 #define STATUS_KEY_NOT_CREATED 75
#define STATUS_NEED_PASSPHRASE_PIN 76
/*-- status.c --*/ /*-- status.c --*/
void set_status_fd ( int fd ); void set_status_fd ( int fd );