From edca7206ca9acd95b298b40994b2c2527201a0ac Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 25 Apr 1998 08:08:35 +0000 Subject: [PATCH] changes from laptop --- Makefile.in | 23 +------------ TODO | 25 ++++++++------ checks/genkey1024.test | 19 ++++++----- cipher/Makefile.in | 20 ----------- g10/ChangeLog | 14 ++++++++ g10/Makefile.in | 49 +++++++++------------------ g10/armor.c | 4 +-- g10/getkey.c | 38 +++++++++++++-------- g10/kbnode.c | 2 +- g10/keyedit.c | 20 ++++++++--- g10/mainproc.c | 2 +- g10/sig-check.c | 76 ++++++++++++++++++++++++++++++------------ include/util.h | 2 +- mpi/Makefile.in | 20 ----------- tools/Makefile.in | 20 ----------- util/Makefile.in | 20 ----------- 16 files changed, 153 insertions(+), 201 deletions(-) diff --git a/Makefile.in b/Makefile.in index cd28655e3..a889c863d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,46 +61,25 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@ CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ G10_LOCALEDIR = @G10_LOCALEDIR@ -GENCAT = @GENCAT@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MPI_EXTRA_ASM_OBJS = @MPI_EXTRA_ASM_OBJS@ -MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ -POSUB = @POSUB@ RANLIB = @RANLIB@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ SUBDIRS = intl po zlib util mpi cipher tools g10 doc checks EXTRA_DIST = VERSION -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \ -aclocal.m4 config.h.in configure configure.in stamp-h.in +config.h.in configure configure.in stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/TODO b/TODO index ff7edcc09..3e39c0886 100644 --- a/TODO +++ b/TODO @@ -19,16 +19,17 @@ we have a self-signature -> put this stuff into a kind of directory record, as it does not belong to the pubkey record? - * add an option to create a new user id and to reorder the sequence of - them, so that the preferred emal address comes first. We need to - add some logic, which guarantees, that only one user-id can be signed by - others. This prevents extensive growing of the public key certificate - due to the bad usage of signing every user id. You get no extra - security by key signatures for every user id. I consider this - behaviour of PGP a bug, introduced, becaus PGP does't require a - self-signature. New user ids will only have your self signature to bind - them to your key and because the user id which is signed by others has - also be signed by you, all user-ids are bound together. + * add an option to create a new user id. + Make it possible to chnage the signature class of the self-signatures, + which can then be used to chnage the displayed order of user-ids: + Put the user-id with a self-signature of class 0x13 always on top + of the displayed list (needs changes in the user-id-from-keyid + functions). + + * enhance --sign-key, so that multiple-user-ids can be signed + (use the new classes 0x14..17) + + * support these multi-user-id-sigs in trustdb. * add an option to re-create a public key from a secret key. Think about a backup system of only the secret part of the secret key. @@ -44,5 +45,7 @@ * replace getkey.c#enum_secret_keys - * add readline support. + * add readline support (but how can we allcoate it in secure memory?) + + * add multi-user-id-sigs handling to import.c diff --git a/checks/genkey1024.test b/checks/genkey1024.test index f8533919e..faaea2d1b 100755 --- a/checks/genkey1024.test +++ b/checks/genkey1024.test @@ -2,7 +2,8 @@ . defs.inc || exit 3 -info "This expect script does yet work" +info "This expect script does not yet work" +info "Please, all those expect gurus, can you help me with it?" exit 0 expect - < (INSECURE!)\"\r \r Edit (N)ame, (C)omment, (E)mail or (O)kay? " send -- "o\r" expect -exact "o\r -\r \rYou need a Passphrase to protect your secret key.\r +\r \rYou need a Passphrase to protect your secret key.\r \r Enter pass phrase: " send -- "abc\r" diff --git a/cipher/Makefile.in b/cipher/Makefile.in index d6bfab330..bc910abb8 100644 --- a/cipher/Makefile.in +++ b/cipher/Makefile.in @@ -61,36 +61,16 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@ CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ G10_LOCALEDIR = @G10_LOCALEDIR@ -GENCAT = @GENCAT@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MPI_EXTRA_ASM_OBJS = @MPI_EXTRA_ASM_OBJS@ -MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ -POSUB = @POSUB@ RANLIB = @RANLIB@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -I../intl EXTRA_DIST = @CIPHER_EXTRA_DIST@ diff --git a/g10/ChangeLog b/g10/ChangeLog index 792dae02b..e95394f96 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,17 @@ +Fri Apr 24 17:38:48 1998 Werner Koch,mobil,,, (wk@tobold) + + * sig-check.c (check_key_signature): Add sig-class 0x14..0x17 + * keyedit.c (sign-key): Some changes to start with support of + the above new sig-classes. + +Wed Apr 22 09:01:57 1998 Werner Koch,mobil,,, (wk@tobold) + + * getkey.c (compare_name): add email matching + +Tue Apr 21 16:17:12 1998 Werner Koch,mobil,,, (wk@tobold) + + * armor.c (armor_filter): fixed missing last LF before CSUM. + Thu Apr 9 11:35:22 1998 Werner Koch (wk@isil.d.shuttle.de) * seckey-cert.c (do_check): New; combines all the check functions diff --git a/g10/Makefile.in b/g10/Makefile.in index 4b37cc030..8574f6c07 100644 --- a/g10/Makefile.in +++ b/g10/Makefile.in @@ -61,36 +61,16 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@ CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ G10_LOCALEDIR = @G10_LOCALEDIR@ -GENCAT = @GENCAT@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MPI_EXTRA_ASM_OBJS = @MPI_EXTRA_ASM_OBJS@ -MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ -POSUB = @POSUB@ RANLIB = @RANLIB@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -I../intl EXTRA_DIST = OPTIONS pubring.asc @@ -156,6 +136,8 @@ gpgm_SOURCES = dearmor.c \ $(common_source) gpgd_SOURCES = gpgd.c \ + ks-proto.h \ + ks-proto.c \ $(common_source) LDADD = @INTLLIBS@ $(needed_libs) @ZLIBS@ @@ -192,13 +174,13 @@ sig-check.o signal.o gpgm_DEPENDENCIES = g10maint.o ../cipher/libcipher.a ../mpi/libmpi.a \ ../util/libutil.a gpgm_LDFLAGS = -gpgd_OBJECTS = gpgd.o build-packet.o compress.o free-packet.o getkey.o \ -pkclist.o skclist.o ringedit.o kbnode.o mainproc.o armor.o mdfilter.o \ -textfilter.o cipher.o elg.o dsa.o rsa.o misc.o openfile.o keyid.o \ -trustdb.o parse-packet.o passphrase.o pubkey-enc.o seckey-cert.o \ -seskey.o import.o export.o comment.o status.o sign.o keyedit.o \ -plaintext.o encr-data.o encode.o revoke.o keylist.o sig-check.o \ -signal.o +gpgd_OBJECTS = gpgd.o ks-proto.o build-packet.o compress.o \ +free-packet.o getkey.o pkclist.o skclist.o ringedit.o kbnode.o \ +mainproc.o armor.o mdfilter.o textfilter.o cipher.o elg.o dsa.o rsa.o \ +misc.o openfile.o keyid.o trustdb.o parse-packet.o passphrase.o \ +pubkey-enc.o seckey-cert.o seskey.o import.o export.o comment.o \ +status.o sign.o keyedit.o plaintext.o encr-data.o encode.o revoke.o \ +keylist.o sig-check.o signal.o gpgd_LDADD = $(LDADD) gpgd_DEPENDENCIES = ../cipher/libcipher.a ../mpi/libmpi.a \ ../util/libutil.a @@ -218,12 +200,13 @@ DEP_FILES = .deps/armor.P .deps/build-packet.P .deps/cipher.P \ .deps/dsa.P .deps/elg.P .deps/encode.P .deps/encr-data.P .deps/export.P \ .deps/free-packet.P .deps/g10.P .deps/getkey.P .deps/gpgd.P \ .deps/import.P .deps/kbnode.P .deps/keyedit.P .deps/keygen.P \ -.deps/keyid.P .deps/keylist.P .deps/mainproc.P .deps/mdfilter.P \ -.deps/misc.P .deps/openfile.P .deps/parse-packet.P .deps/passphrase.P \ -.deps/pkclist.P .deps/plaintext.P .deps/pubkey-enc.P .deps/revoke.P \ -.deps/ringedit.P .deps/rsa.P .deps/seckey-cert.P .deps/seskey.P \ -.deps/sig-check.P .deps/sign.P .deps/signal.P .deps/skclist.P \ -.deps/status.P .deps/textfilter.P .deps/trustdb.P .deps/verify.P +.deps/keyid.P .deps/keylist.P .deps/ks-proto.P .deps/mainproc.P \ +.deps/mdfilter.P .deps/misc.P .deps/openfile.P .deps/parse-packet.P \ +.deps/passphrase.P .deps/pkclist.P .deps/plaintext.P .deps/pubkey-enc.P \ +.deps/revoke.P .deps/ringedit.P .deps/rsa.P .deps/seckey-cert.P \ +.deps/seskey.P .deps/sig-check.P .deps/sign.P .deps/signal.P \ +.deps/skclist.P .deps/status.P .deps/textfilter.P .deps/trustdb.P \ +.deps/verify.P SOURCES = $(gpg_SOURCES) $(gpgm_SOURCES) $(gpgd_SOURCES) OBJECTS = $(gpg_OBJECTS) $(gpgm_OBJECTS) $(gpgd_OBJECTS) diff --git a/g10/armor.c b/g10/armor.c index 6d39dd9d1..7617415cb 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -510,7 +510,7 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen, case fhdrTESTSpaces: { /* but must check whether the rest of the line * only contains white spaces; this is problematic - * since we may have to restore the stuff. simply + * since we may have to restore the stuff. simply * counting spaces is not enough, because it may be a * mix of different white space characters */ IOBUF b = iobuf_temp(); @@ -1018,7 +1018,7 @@ armor_filter( void *opaque, int control, ++idx2; } /* may need a linefeed */ - if( idx2 < (72/4) ) + if( idx2 <= (72/4) ) iobuf_put(a, '\n'); /* write the CRC */ iobuf_put(a, '='); diff --git a/g10/getkey.c b/g10/getkey.c index a1dc25239..3edadfe92 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -539,6 +539,7 @@ static int compare_name( const char *uid, size_t uidlen, const char *name, int mode ) { int i; + const char *s, *se; if( mode == 1 ) { /* exact match */ for(i=0; name[i] && uidlen; i++, uidlen-- ) @@ -551,20 +552,29 @@ compare_name( const char *uid, size_t uidlen, const char *name, int mode ) if( memistr( uid, uidlen, name ) ) return 0; } - else if( mode == 3 ) { /* case insensitive email address */ - /* FIXME: not yet implemented */ - if( memistr( uid, uidlen, name ) ) - return 0; - } - else if( mode == 4 ) { /* email substring */ - /* FIXME: not yet implemented */ - if( memistr( uid, uidlen, name ) ) - return 0; - } - else if( mode == 5 ) { /* email from end */ - /* FIXME: not yet implemented */ - if( memistr( uid, uidlen, name ) ) - return 0; + else if( mode >= 3 && mode <= 5 ) { /* look at the email address */ + for( i=0, s= uid; i < uidlen && *s != '<'; s++, i++ ) + ; + if( i < uidlen ) { + /* skip opening delim and one char and look for the closing one*/ + s++; i++; + for( se=s+1, i++; i < uidlen && *se != '>'; se++, i++ ) + ; + if( i < uidlen ) { + i = se - s; + if( mode == 3 ) { /* exact email address */ + if( strlen(name) == i && !memicmp( s, name, i) ) + return 0; + } + else if( mode == 4 ) { /* email substring */ + if( memistr( s, i, name ) ) + return 0; + } + else { /* email from end */ + /* nyi */ + } + } + } } else BUG(); diff --git a/g10/kbnode.c b/g10/kbnode.c index d50d0578c..bdb58d191 100644 --- a/g10/kbnode.c +++ b/g10/kbnode.c @@ -136,7 +136,7 @@ find_prev_kbnode( KBNODE root, KBNODE node, int pkttype ) } /**************** - * Ditto, but find the next package. The behaviour is trivial if + * Ditto, but find the next packet. The behaviour is trivial if * PKTTYPE is 0 but if it is specified, the next node with a packet * of this type is returned. The function has some knowledge about * the valid ordering of packets: e.g. if the next signature packet diff --git a/g10/keyedit.c b/g10/keyedit.c index 461051a7f..634baa1c6 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -299,25 +299,27 @@ sign_key( const char *username, STRLIST locusr ) } } - /* check whether we have already signed it */ + /* check whether we it is possible to sign this key */ for( skc_rover = skc_list; skc_rover; skc_rover = skc_rover->next ) { u32 akeyid[2]; keyid_from_skc( skc_rover->skc, akeyid ); for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) { - if( node->pkt->pkttype == PKT_SIGNATURE + if( node->pkt->pkttype == PKT_USER_ID ) + skc_rover->mark = 1; + else if( node->pkt->pkttype == PKT_SIGNATURE && (node->pkt->pkt.signature->sig_class&~3) == 0x10 ) { if( akeyid[0] == node->pkt->pkt.signature->keyid[0] && akeyid[1] == node->pkt->pkt.signature->keyid[1] ) { log_info("Already signed by keyid %08lX\n", (ulong)akeyid[1] ); - skc_rover->mark = 1; + skc_rover->mark = 0; } } } } for( skc_rover = skc_list; skc_rover; skc_rover = skc_rover->next ) { - if( !skc_rover->mark ) + if( skc_rover->mark ) break; } if( !skc_rover ) { @@ -326,8 +328,16 @@ sign_key( const char *username, STRLIST locusr ) } /* Loop over all signers and all user ids and sign */ + /* FIXME: we have to change it: Present all user-ids and + * then ask whether all those ids shall be signed if the user + * answers yes, go and make a 0x14 sign class packet and remove + * old one-user-id-only-sigs (user should be noted of this + * condition while presenting the user-ids); if he had answered + * no, present each user-id in turn and ask which one should be signed + * (only one) - if there is already a single-user-sig, do nothing. + * (this is propably already out in the world) */ for( skc_rover = skc_list; skc_rover; skc_rover = skc_rover->next ) { - if( skc_rover->mark ) + if( !skc_rover->mark ) continue; for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) { if( node->pkt->pkttype == PKT_USER_ID ) { diff --git a/g10/mainproc.c b/g10/mainproc.c index 7b82b8165..d8da7a41b 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -307,7 +307,7 @@ do_check_sig( CTX c, KBNODE node ) else if( (sig->sig_class&~3) == 0x10 || sig->sig_class == 0x18 || sig->sig_class == 0x20 - || sig->sig_class == 0x30 ) { /* classes 0x10..0x13,0x20,0x30 */ + || sig->sig_class == 0x30 ) { /* classes 0x10..0x17,0x20,0x30 */ if( c->list->pkt->pkttype == PKT_PUBLIC_CERT || c->list->pkt->pkttype == PKT_PUBKEY_SUBCERT ) { return check_key_signature( c->list, node, NULL ); diff --git a/g10/sig-check.c b/g10/sig-check.c index ecefcf596..7051b3be4 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -37,9 +37,9 @@ static int do_check( PKT_public_cert *pkc, PKT_signature *sig, /**************** - * Check the signature which is contained in the rsa_integer. + * Check the signature which is contained in SIG. * The md5handle should be currently open, so that this function - * is able to append some data, before getting the digest. + * is able to append some data, before finalizing the digest. */ int signature_check( PKT_signature *sig, MD_HANDLE digest ) @@ -234,6 +234,24 @@ do_check( PKT_public_cert *pkc, PKT_signature *sig, MD_HANDLE digest ) } +static void +hash_uid_node( KBNODE unode, MD_HANDLE md, PKT_signature *sig ) +{ + PKT_user_id *uid = unode->pkt->pkt.user_id; + + assert( unode->pkt->pkttype == PKT_USER_ID ); + if( sig->version >=4 ) { + byte buf[5]; + buf[0] = 0xb4; /* indicates a userid packet */ + buf[1] = uid->len >> 24; /* always use 4 length bytes */ + buf[2] = uid->len >> 16; + buf[3] = uid->len >> 8; + buf[4] = uid->len; + md_write( md, buf, 5 ); + } + md_write( md, uid->name, uid->len ); +} + /**************** * check the signature pointed to by NODE. This is a key signature. * If the function detects a self-signature, it uses the PKC from @@ -255,15 +273,7 @@ check_key_signature( KBNODE root, KBNODE node, int *is_selfsig ) pkc = root->pkt->pkt.public_cert; sig = node->pkt->pkt.signature; - - if( sig->pubkey_algo == PUBKEY_ALGO_ELGAMAL ) - algo = sig->digest_algo; - else if( sig->pubkey_algo == PUBKEY_ALGO_DSA ) - algo = sig->digest_algo; - else if(sig->pubkey_algo == PUBKEY_ALGO_RSA ) - algo = sig->digest_algo; - else - return G10ERR_PUBKEY_ALGO; + algo = sig->digest_algo; if( (rc=check_digest_algo(algo)) ) return rc; @@ -288,26 +298,48 @@ check_key_signature( KBNODE root, KBNODE node, int *is_selfsig ) rc = G10ERR_SIG_CLASS; } } + else if( sig->sig_class >= 0x14 && sig->sig_class <= 0x17 ) { + /* a gnupg extension: calculate the signature over all + * preceding userids */ + KBNODE unode = find_prev_kbnode( root, node, PKT_USER_ID ); + u32 keyid[2]; + int any = 0; + + keyid_from_pkc( pkc, keyid ); + md = md_open( algo, 0 ); + hash_public_cert( md, pkc ); + + for( unode=root->next; unode && unode != node; unode = unode->next ) { + if( unode->pkt->pkttype == PKT_USER_ID ) { + hash_uid_node( unode, md, sig ); + any++; + } + } + if( any ) { + if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] ) { + if( is_selfsig ) + *is_selfsig = 1; + rc = do_check( pkc, sig, md ); + } + else + rc = signature_check( sig, md ); + } + else { + log_error("no user id for key signature packet\n"); + rc = G10ERR_SIG_CLASS; + } + md_close(md); + } else { KBNODE unode = find_prev_kbnode( root, node, PKT_USER_ID ); if( unode ) { - PKT_user_id *uid = unode->pkt->pkt.user_id; u32 keyid[2]; keyid_from_pkc( pkc, keyid ); md = md_open( algo, 0 ); hash_public_cert( md, pkc ); - if( sig->version >=4 ) { - byte buf[5]; - buf[0] = 0xb4; /* indicates a userid packet */ - buf[1] = uid->len >> 24; /* always use 4 length bytes */ - buf[2] = uid->len >> 16; - buf[3] = uid->len >> 8; - buf[4] = uid->len; - md_write( md, buf, 5 ); - } - md_write( md, uid->name, uid->len ); + hash_uid_node( unode, md, sig ); if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] ) { if( is_selfsig ) *is_selfsig = 1; diff --git a/include/util.h b/include/util.h index 620457860..3f39656f3 100644 --- a/include/util.h +++ b/include/util.h @@ -116,7 +116,7 @@ void free_strlist( STRLIST sl ); void add_to_strlist( STRLIST *list, const char *string ); STRLIST strlist_prev( STRLIST head, STRLIST node ); STRLIST strlist_last( STRLIST node ); -char *memistr( char *buf, size_t buflen, const char *sub ); +const char *memistr( const char *buf, size_t buflen, const char *sub ); char *mem2str( char *, const void *, size_t); char *trim_spaces( char *string ); int string_count_chr( const char *string, int c ); diff --git a/mpi/Makefile.in b/mpi/Makefile.in index c0db398a7..a28977fc3 100644 --- a/mpi/Makefile.in +++ b/mpi/Makefile.in @@ -61,36 +61,16 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@ CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ G10_LOCALEDIR = @G10_LOCALEDIR@ -GENCAT = @GENCAT@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MPI_EXTRA_ASM_OBJS = @MPI_EXTRA_ASM_OBJS@ -MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ -POSUB = @POSUB@ RANLIB = @RANLIB@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include diff --git a/tools/Makefile.in b/tools/Makefile.in index 6920c4cbe..f42cb51fa 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -61,36 +61,16 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@ CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ G10_LOCALEDIR = @G10_LOCALEDIR@ -GENCAT = @GENCAT@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MPI_EXTRA_ASM_OBJS = @MPI_EXTRA_ASM_OBJS@ -MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ -POSUB = @POSUB@ RANLIB = @RANLIB@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -I../intl needed_libs = ../cipher/libcipher.a ../util/libutil.a \ diff --git a/util/Makefile.in b/util/Makefile.in index 025ea3f8e..5f72e6533 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -61,36 +61,16 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CIPHER_EXTRA_DIST = @CIPHER_EXTRA_DIST@ CIPHER_EXTRA_OBJS = @CIPHER_EXTRA_OBJS@ CPP = @CPP@ -DATADIRNAME = @DATADIRNAME@ G10_LOCALEDIR = @G10_LOCALEDIR@ -GENCAT = @GENCAT@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MPI_EXTRA_ASM_OBJS = @MPI_EXTRA_ASM_OBJS@ -MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ -POSUB = @POSUB@ RANLIB = @RANLIB@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -I../intl