gnupg/g10 (ChangeLog keyedit.c keygen.c keyid.c)

[cvs user dshaw]

    Date: Friday, January 28, 2005 @ 01:50:10
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog keyedit.c keygen.c keyid.c

* keyid.c (keyid_from_sk, keyid_from_pk): Use 0xFFFFFFFFFFFFFFFF
instead of 0x0000000000000000 for the invalid key ID since all-zeroes
is reserved for the anonymous recipient.

* keyedit.c (change_passphrase), keygen.c (generate_subkeypair): Fix a
string ;)


-----------+
 ChangeLog |    9 +++++++++
 keyedit.c |    2 +-
 keygen.c  |    2 +-
 keyid.c   |    8 ++++----
 4 files changed, 15 insertions(+), 6 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.690 gnupg/g10/ChangeLog:1.691
--- gnupg/g10/ChangeLog:1.690	Thu Jan 27 12:48:33 2005
+++ gnupg/g10/ChangeLog	Fri Jan 28 01:50:10 2005
@@ -1,3 +1,12 @@
+2005-01-27  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyid.c (keyid_from_sk, keyid_from_pk): Use 0xFFFFFFFFFFFFFFFF
+	instead of 0x0000000000000000 for the invalid key ID since
+	all-zeroes is reserved for the anonymous recipient.
+
+	* keyedit.c (change_passphrase), keygen.c (generate_subkeypair):
+	Fix a string ;)
+
 2005-01-27  Werner Koch  <wk at g10code.com>
 
 	* keygen.c (generate_subkeypair): Detect primary key on-card and
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.169 gnupg/g10/keyedit.c:1.170
--- gnupg/g10/keyedit.c:1.169	Thu Jan 27 12:48:33 2005
+++ gnupg/g10/keyedit.c	Fri Jan 28 01:50:10 2005
@@ -1110,7 +1110,7 @@
 	    no_primary_secrets = 1;
 	}
 	else if( sk->protect.s2k.mode == 1002 ) {
-	    tty_printf(_("Secret parts of primary key are store on-card.\n"));
+	    tty_printf(_("Secret parts of primary key are stored on-card.\n"));
 	    no_primary_secrets = 1;
 	}
 	else {
Index: gnupg/g10/keygen.c
diff -u gnupg/g10/keygen.c:1.143 gnupg/g10/keygen.c:1.144
--- gnupg/g10/keygen.c:1.143	Thu Jan 27 12:48:33 2005
+++ gnupg/g10/keygen.c	Fri Jan 28 01:50:10 2005
@@ -3049,7 +3049,7 @@
 	tty_printf(_("This key is not protected.\n"));
 	break;
       case -2:
-        tty_printf(_("Secret parts of primary key are store on-card.\n"));
+        tty_printf(_("Secret parts of primary key are stored on-card.\n"));
         ask_pass = 1;
         break;
       default:
Index: gnupg/g10/keyid.c
diff -u gnupg/g10/keyid.c:1.52 gnupg/g10/keyid.c:1.53
--- gnupg/g10/keyid.c:1.52	Thu Dec 30 04:26:57 2004
+++ gnupg/g10/keyid.c	Fri Jan 28 01:50:10 2005
@@ -280,7 +280,7 @@
 	  sk->keyid[1]=keyid[1];
 	}
       else
-	sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+	sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
     }
   else
     {
@@ -298,7 +298,7 @@
 	  sk->keyid[1] = keyid[1];
 	}
       else
-	sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+	sk->keyid[0]=sk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
     }
 
   return lowbits;
@@ -334,7 +334,7 @@
 	  pk->keyid[1] = keyid[1];
 	}
       else
-	pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+	pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
     }
   else
     {
@@ -352,7 +352,7 @@
 	  pk->keyid[1] = keyid[1];
 	}
       else
-	pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0;
+	pk->keyid[0]=pk->keyid[1]=keyid[0]=keyid[1]=lowbits=0xFFFFFFFF;
     }
 
   return lowbits;