Update head to match stable 1.0

include/errors.h

@@ -1,5 +1,5 @@
-/* errors.h - error codes fro GnuPG
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* errors.h - erro code
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -17,67 +17,68 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifndef GPG_ERRORS_H
-#define GPG_ERRORS_H
+#ifndef G10_ERRORS_H
+#define G10_ERRORS_H
 
+#define G10ERR_GENERAL	       1
+#define G10ERR_UNKNOWN_PACKET  2
+#define G10ERR_UNKNOWN_VERSION 3 /* Unknown version (in packet) */
+#define G10ERR_PUBKEY_ALGO     4 /* Unknown pubkey algorithm */
+#define G10ERR_DIGEST_ALGO     5 /* Unknown digest algorithm */
+#define G10ERR_BAD_PUBKEY      6 /* Bad public key */
+#define G10ERR_BAD_SECKEY      7 /* Bad secret key */
+#define G10ERR_BAD_SIGN        8 /* Bad signature */
+#define G10ERR_NO_PUBKEY       9 /* public key not found */
+#define G10ERR_CHECKSUM       10 /* checksum error */
+#define G10ERR_BAD_PASS       11 /* Bad passphrase */
+#define G10ERR_CIPHER_ALGO    12 /* Unknown cipher algorithm */
+#define G10ERR_KEYRING_OPEN   13
+#define G10ERR_INVALID_PACKET 14
+#define G10ERR_INVALID_ARMOR  15
+#define G10ERR_NO_USER_ID     16
+#define G10ERR_NO_SECKEY      17 /* secret key not available */
+#define G10ERR_WRONG_SECKEY   18 /* wrong seckey used */
+#define G10ERR_UNSUPPORTED    19
+#define G10ERR_BAD_KEY	      20 /* bad (session) key */
+#define G10ERR_READ_FILE      21
+#define G10ERR_WRITE_FILE     22
+#define G10ERR_COMPR_ALGO     23 /* Unknown compress algorithm */
+#define G10ERR_OPEN_FILE      24
+#define G10ERR_CREATE_FILE    25
+#define G10ERR_PASSPHRASE     26 /* invalid passphrase */
+#define G10ERR_NI_PUBKEY      27
+#define G10ERR_NI_CIPHER      28
+#define G10ERR_SIG_CLASS      29
+#define G10ERR_BAD_MPI	      30
+#define G10ERR_RESOURCE_LIMIT 31
+#define G10ERR_INV_KEYRING    32
+#define G10ERR_TRUSTDB	      33 /* a problem with the trustdb */
+#define G10ERR_BAD_CERT       34 /* bad certicate */
+#define G10ERR_INV_USER_ID    35
+#define G10ERR_CLOSE_FILE     36
+#define G10ERR_RENAME_FILE    37
+#define G10ERR_DELETE_FILE    38
+#define G10ERR_UNEXPECTED     39
+#define G10ERR_TIME_CONFLICT  40
+#define G10ERR_WR_PUBKEY_ALGO 41 /* unusabe pubkey algo */
+#define G10ERR_FILE_EXISTS    42
+#define G10ERR_WEAK_KEY       43 /* NOTE: hardcoded into the cipher modules */
+#define G10ERR_WRONG_KEYLEN   44 /* NOTE: hardcoded into the cipher modules */
+#define G10ERR_INV_ARG	      45
+#define G10ERR_BAD_URI	      46  /* syntax error in URI */
+#define G10ERR_INVALID_URI    47  /* e.g. unsupported scheme */
+#define G10ERR_NETWORK	      48  /* general network error */
+#define G10ERR_UNKNOWN_HOST   49
+#define G10ERR_SELFTEST_FAILED 50
+#define G10ERR_NOT_ENCRYPTED  51
+#define G10ERR_NOT_PROCESSED  52
+#define G10ERR_UNU_PUBKEY     53
+#define G10ERR_UNU_SECKEY     54
+#define G10ERR_KEYSERVER      55
 
-/* FIXME: some constants have to be the same as the ones from
- * libgcrypt - include gcrypt.h and use those constants */
-#define GPGERR_GENERAL	       101
-#define GPGERR_UNKNOWN_PACKET  102
-#define GPGERR_UNKNOWN_VERSION 103 /* Unknown version (in packet) */
-#define GPGERR_PUBKEY_ALGO	 4 /* Unknown pubkey algorithm */
-#define GPGERR_DIGEST_ALGO	 5 /* Unknown digest algorithm */
-#define GPGERR_BAD_PUBKEY	 6 /* Bad public key */
-#define GPGERR_BAD_SECKEY	 7 /* Bad secret key */
-#define GPGERR_BAD_SIGN 	 8 /* Bad signature */
-#define GPGERR_NO_PUBKEY       109 /* public key not found */
-#define GPGERR_CHECKSUM        110 /* checksum error */
-#define GPGERR_BAD_PASS        111 /* Bad passphrase */
-#define GPGERR_CIPHER_ALGO	12 /* Unknown cipher algorithm */
-#define GPGERR_KEYRING_OPEN    113
-#define GPGERR_INVALID_PACKET  114
-#define GPGERR_INVALID_ARMOR   115
-#define GPGERR_NO_USER_ID      116
-#define GPGERR_NO_SECKEY       117 /* secret key not available */
-#define GPGERR_WRONG_SECKEY    118 /* wrong seckey used */
-#define GPGERR_UNSUPPORTED     119
-#define GPGERR_BAD_KEY	       120 /* bad (session) key */
-#define GPGERR_READ_FILE       121
-#define GPGERR_WRITE_FILE      122
-#define GPGERR_COMPR_ALGO      123 /* Unknown compress algorithm */
-#define GPGERR_OPEN_FILE       124
-#define GPGERR_CREATE_FILE     125
-#define GPGERR_PASSPHRASE      126 /* invalid passphrase */
-#define GPGERR_NI_PUBKEY       127
-#define GPGERR_NI_CIPHER       128
-#define GPGERR_SIG_CLASS       129
-#define GPGERR_BAD_MPI		30
-#define GPGERR_RESOURCE_LIMIT  131
-#define GPGERR_INV_KEYRING     132
-#define GPGERR_TRUSTDB	       133 /* a problem with the trustdb */
-#define GPGERR_BAD_CERT        134 /* bad certicate */
-#define GPGERR_INV_USER_ID     135
-#define GPGERR_CLOSE_FILE      136
-#define GPGERR_RENAME_FILE     137
-#define GPGERR_DELETE_FILE     138
-#define GPGERR_UNEXPECTED      139
-#define GPGERR_TIME_CONFLICT   140
-#define GPGERR_WR_PUBKEY_ALGO	41 /* unusabe pubkey algo */
-#define GPGERR_FILE_EXISTS     142
-#define GPGERR_WEAK_KEY 	43 /* NOTE: hardcoded into the cipher modules */
-#define GPGERR_WRONG_KEYLEN	44 /* NOTE: hardcoded into the cipher modules */
-#define GPGERR_INV_ARG	       145
-#define GPGERR_BAD_URI	       146  /* syntax error in URI */
-#define GPGERR_INVALID_URI     147  /* e.g. unsupported scheme */
-#define GPGERR_NETWORK	       148  /* general network error */
-#define GPGERR_UNKNOWN_HOST    149
-#define GPGERR_SELFTEST_FAILED	50
-#define GPGERR_NOT_ENCRYPTED   151
-#define GPGERR_NOT_PROCESSED   152
 
 #ifndef HAVE_STRERROR
 char *strerror( int n );
 #endif
 
-#endif /*GPG_ERRORS_H*/
+#endif /*G10_ERRORS_H*/