mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
See ChangeLog: Thu Jan 27 18:00:44 CET 2000 Werner Koch
This commit is contained in:
Werner Koch
parent
db43afc923
commit
baa30ad117
75 changed files with 1084 additions and 775 deletions
|
|
@ -1,3 +1,7 @@
|
|||
Thu Jan 27 18:00:44 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* Changed all "g10_"/"GPG_" prefixes to "gpg_"/"GPG_".
|
||||
|
||||
Mon Jan 24 13:04:28 CET 2000 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* memory.h: Removed.
|
||||
|
|
|
|||
108
include/errors.h
108
include/errors.h
|
|
@ -17,66 +17,66 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ifndef G10_ERRORS_H
|
||||
#define G10_ERRORS_H
|
||||
#ifndef GPG_ERRORS_H
|
||||
#define GPG_ERRORS_H
|
||||
|
||||
|
||||
/* FIXME: some constants have to be the same as the ones from
|
||||
* libgcrypt - include gcrypt.h and use those constants */
|
||||
#define G10ERR_GENERAL 101
|
||||
#define G10ERR_UNKNOWN_PACKET 102
|
||||
#define G10ERR_UNKNOWN_VERSION 103 /* 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 109 /* public key not found */
|
||||
#define G10ERR_CHECKSUM 110 /* checksum error */
|
||||
#define G10ERR_BAD_PASS 111 /* Bad passphrase */
|
||||
#define G10ERR_CIPHER_ALGO 12 /* Unknown cipher algorithm */
|
||||
#define G10ERR_KEYRING_OPEN 113
|
||||
#define G10ERR_INVALID_PACKET 114
|
||||
#define G10ERR_INVALID_ARMOR 115
|
||||
#define G10ERR_NO_USER_ID 116
|
||||
#define G10ERR_NO_SECKEY 117 /* secret key not available */
|
||||
#define G10ERR_WRONG_SECKEY 118 /* wrong seckey used */
|
||||
#define G10ERR_UNSUPPORTED 119
|
||||
#define G10ERR_BAD_KEY 120 /* bad (session) key */
|
||||
#define G10ERR_READ_FILE 121
|
||||
#define G10ERR_WRITE_FILE 122
|
||||
#define G10ERR_COMPR_ALGO 123 /* Unknown compress algorithm */
|
||||
#define G10ERR_OPEN_FILE 124
|
||||
#define G10ERR_CREATE_FILE 125
|
||||
#define G10ERR_PASSPHRASE 126 /* invalid passphrase */
|
||||
#define G10ERR_NI_PUBKEY 127
|
||||
#define G10ERR_NI_CIPHER 128
|
||||
#define G10ERR_SIG_CLASS 129
|
||||
#define G10ERR_BAD_MPI 30
|
||||
#define G10ERR_RESOURCE_LIMIT 131
|
||||
#define G10ERR_INV_KEYRING 132
|
||||
#define G10ERR_TRUSTDB 133 /* a problem with the trustdb */
|
||||
#define G10ERR_BAD_CERT 134 /* bad certicate */
|
||||
#define G10ERR_INV_USER_ID 135
|
||||
#define G10ERR_CLOSE_FILE 136
|
||||
#define G10ERR_RENAME_FILE 137
|
||||
#define G10ERR_DELETE_FILE 138
|
||||
#define G10ERR_UNEXPECTED 139
|
||||
#define G10ERR_TIME_CONFLICT 140
|
||||
#define G10ERR_WR_PUBKEY_ALGO 41 /* unusabe pubkey algo */
|
||||
#define G10ERR_FILE_EXISTS 142
|
||||
#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 145
|
||||
#define G10ERR_BAD_URI 146 /* syntax error in URI */
|
||||
#define G10ERR_INVALID_URI 147 /* e.g. unsupported scheme */
|
||||
#define G10ERR_NETWORK 148 /* general network error */
|
||||
#define G10ERR_UNKNOWN_HOST 149
|
||||
#define G10ERR_SELFTEST_FAILED 50
|
||||
#define G10ERR_NOT_ENCRYPTED 151
|
||||
#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
|
||||
|
||||
#ifndef HAVE_STRERROR
|
||||
char *strerror( int n );
|
||||
#endif
|
||||
|
||||
#endif /*G10_ERRORS_H*/
|
||||
#endif /*GPG_ERRORS_H*/
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
||||
#ifndef G10_HOST2NET_H
|
||||
#define G10_HOST2NET_H
|
||||
#ifndef GPG_HOST2NET_H
|
||||
#define GPG_HOST2NET_H
|
||||
|
||||
#include "types.h"
|
||||
|
||||
|
|
@ -40,4 +40,4 @@
|
|||
#define u32tobuf( p, a) ulongtobuf( (p), (a) )
|
||||
|
||||
|
||||
#endif /*G10_HOST2NET_H*/
|
||||
#endif /*GPG_HOST2NET_H*/
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ifndef G10_HTTP_H
|
||||
#define G10_HTTP_H 1
|
||||
#ifndef GPG_HTTP_H
|
||||
#define GPG_HTTP_H 1
|
||||
|
||||
#include "iobuf.h"
|
||||
|
||||
|
|
@ -72,4 +72,4 @@ void http_close( HTTP_HD hd );
|
|||
|
||||
int http_open_document( HTTP_HD hd, const char *document, unsigned int flags );
|
||||
|
||||
#endif /*G10_HTTP_H*/
|
||||
#endif /*GPG_HTTP_H*/
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
||||
#ifndef G10_I18N_H
|
||||
#define G10_I18N_H
|
||||
#ifndef GPG_I18N_H
|
||||
#define GPG_I18N_H
|
||||
|
||||
#ifdef USE_SIMPLE_GETTEXT
|
||||
int set_gettext_file( const char *filename );
|
||||
|
|
@ -47,4 +47,4 @@
|
|||
#endif
|
||||
#endif /* !USE_SIMPLE_GETTEXT */
|
||||
|
||||
#endif /*G10_I18N_H*/
|
||||
#endif /*GPG_I18N_H*/
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
||||
#ifndef G10_IOBUF_H
|
||||
#define G10_IOBUF_H
|
||||
#ifndef GPG_IOBUF_H
|
||||
#define GPG_IOBUF_H
|
||||
|
||||
#include "types.h"
|
||||
|
||||
|
|
@ -144,4 +144,4 @@ int iobuf_in_block_mode( IOBUF a );
|
|||
#define iobuf_get_temp_length(a) ( (a)->d.len )
|
||||
#define iobuf_is_temp(a) ( (a)->use == 3 )
|
||||
|
||||
#endif /*G10_IOBUF_H*/
|
||||
#endif /*GPG_IOBUF_H*/
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ifndef G10_TTYIO_H
|
||||
#define G10_TTYIO_H
|
||||
#ifndef GPG_TTYIO_H
|
||||
#define GPG_TTYIO_H
|
||||
|
||||
int tty_batchmode( int onoff );
|
||||
void tty_printf( const char *fmt, ... );
|
||||
|
|
@ -31,4 +31,4 @@ int tty_get_answer_is_yes( const char *prompt );
|
|||
int tty_no_terminal(int onoff);
|
||||
|
||||
|
||||
#endif /*G10_TTYIO_H*/
|
||||
#endif /*GPG_TTYIO_H*/
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
||||
#ifndef G10_TYPES_H
|
||||
#define G10_TYPES_H
|
||||
#ifndef GPG_TYPES_H
|
||||
#define GPG_TYPES_H
|
||||
|
||||
|
||||
/* The AC_CHECK_SIZEOF() in configure fails for some machines.
|
||||
|
|
@ -116,4 +116,4 @@ typedef struct string_list {
|
|||
} *STRLIST;
|
||||
|
||||
|
||||
#endif /*G10_TYPES_H*/
|
||||
#endif /*GPG_TYPES_H*/
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ifndef G10_UTIL_H
|
||||
#define G10_UTIL_H
|
||||
#ifndef GPG_UTIL_H
|
||||
#define GPG_UTIL_H
|
||||
|
||||
#ifdef _GCRYPT_IN_LIBGCRYPT
|
||||
#error This header should not be used internally by libgcrypt
|
||||
|
|
@ -36,60 +36,60 @@
|
|||
/*-- logger.c --*/
|
||||
void log_set_logfile( const char *name, int fd );
|
||||
FILE *log_stream(void);
|
||||
void g10_log_print_prefix(const char *text);
|
||||
void gpg_log_print_prefix(const char *text);
|
||||
void log_set_name( const char *name );
|
||||
const char *log_get_name(void);
|
||||
void log_set_pid( int pid );
|
||||
int log_get_errorcount( int clear );
|
||||
void g10_log_hexdump( const char *text, const char *buf, size_t len );
|
||||
void gpg_log_hexdump( const char *text, const char *buf, size_t len );
|
||||
|
||||
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
|
||||
void g10_log_bug( const char *fmt, ... )
|
||||
void gpg_log_bug( const char *fmt, ... )
|
||||
__attribute__ ((noreturn, format (printf,1,2)));
|
||||
void g10_log_bug0( const char *, int, const char * ) __attribute__ ((noreturn));
|
||||
void g10_log_fatal( const char *fmt, ... )
|
||||
void gpg_log_bug0( const char *, int, const char * ) __attribute__ ((noreturn));
|
||||
void gpg_log_fatal( const char *fmt, ... )
|
||||
__attribute__ ((noreturn, format (printf,1,2)));
|
||||
void g10_log_error( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
|
||||
void g10_log_info( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
|
||||
void g10_log_debug( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
|
||||
void g10_log_fatal_f( const char *fname, const char *fmt, ... )
|
||||
void gpg_log_error( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
|
||||
void gpg_log_info( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
|
||||
void gpg_log_debug( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
|
||||
void gpg_log_fatal_f( const char *fname, const char *fmt, ... )
|
||||
__attribute__ ((noreturn, format (printf,2,3)));
|
||||
void g10_log_error_f( const char *fname, const char *fmt, ... )
|
||||
void gpg_log_error_f( const char *fname, const char *fmt, ... )
|
||||
__attribute__ ((format (printf,2,3)));
|
||||
void g10_log_info_f( const char *fname, const char *fmt, ... )
|
||||
void gpg_log_info_f( const char *fname, const char *fmt, ... )
|
||||
__attribute__ ((format (printf,2,3)));
|
||||
void g10_log_debug_f( const char *fname, const char *fmt, ... )
|
||||
void gpg_log_debug_f( const char *fname, const char *fmt, ... )
|
||||
__attribute__ ((format (printf,2,3)));
|
||||
#define BUG() g10_log_bug0( __FILE__ , __LINE__, __FUNCTION__ )
|
||||
#define BUG() gpg_log_bug0( __FILE__ , __LINE__, __FUNCTION__ )
|
||||
#else
|
||||
void g10_log_bug( const char *fmt, ... );
|
||||
void g10_log_bug0( const char *, int );
|
||||
void g10_log_fatal( const char *fmt, ... );
|
||||
void g10_log_error( const char *fmt, ... );
|
||||
void g10_log_info( const char *fmt, ... );
|
||||
void g10_log_debug( const char *fmt, ... );
|
||||
void g10_log_fatal_f( const char *fname, const char *fmt, ... );
|
||||
void g10_log_error_f( const char *fname, const char *fmt, ... );
|
||||
void g10_log_info_f( const char *fname, const char *fmt, ... );
|
||||
void g10_log_debug_f( const char *fname, const char *fmt, ... );
|
||||
#define BUG() g10_log_bug0( __FILE__ , __LINE__ )
|
||||
void gpg_log_bug( const char *fmt, ... );
|
||||
void gpg_log_bug0( const char *, int );
|
||||
void gpg_log_fatal( const char *fmt, ... );
|
||||
void gpg_log_error( const char *fmt, ... );
|
||||
void gpg_log_info( const char *fmt, ... );
|
||||
void gpg_log_debug( const char *fmt, ... );
|
||||
void gpg_log_fatal_f( const char *fname, const char *fmt, ... );
|
||||
void gpg_log_error_f( const char *fname, const char *fmt, ... );
|
||||
void gpg_log_info_f( const char *fname, const char *fmt, ... );
|
||||
void gpg_log_debug_f( const char *fname, const char *fmt, ... );
|
||||
#define BUG() gpg_log_bug0( __FILE__ , __LINE__ )
|
||||
#endif
|
||||
|
||||
#define log_hexdump g10_log_hexdump
|
||||
#define log_bug g10_log_bug
|
||||
#define log_bug0 g10_log_bug0
|
||||
#define log_fatal g10_log_fatal
|
||||
#define log_error g10_log_error
|
||||
#define log_info g10_log_info
|
||||
#define log_debug g10_log_debug
|
||||
#define log_fatal_f g10_log_fatal_f
|
||||
#define log_error_f g10_log_error_f
|
||||
#define log_info_f g10_log_info_f
|
||||
#define log_debug_f g10_log_debug_f
|
||||
#define log_hexdump gpg_log_hexdump
|
||||
#define log_bug gpg_log_bug
|
||||
#define log_bug0 gpg_log_bug0
|
||||
#define log_fatal gpg_log_fatal
|
||||
#define log_error gpg_log_error
|
||||
#define log_info gpg_log_info
|
||||
#define log_debug gpg_log_debug
|
||||
#define log_fatal_f gpg_log_fatal_f
|
||||
#define log_error_f gpg_log_error_f
|
||||
#define log_info_f gpg_log_info_f
|
||||
#define log_debug_f gpg_log_debug_f
|
||||
|
||||
|
||||
/*-- errors.c --*/
|
||||
const char * g10_errstr( int no );
|
||||
const char * gpg_errstr( int no );
|
||||
|
||||
|
||||
|
||||
|
|
@ -145,4 +145,4 @@ int check_utf8_string( const char *string );
|
|||
#define DIM(v) (sizeof(v)/sizeof((v)[0]))
|
||||
#define DIMof(type,member) DIM(((type *)0)->member)
|
||||
|
||||
#endif /*G10_UTIL_H*/
|
||||
#endif /*GPG_UTIL_H*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue