mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-04 20:38:50 +01:00
d2a70fd834
* g10/sign.c (sign_file): Use log_printf instead of stderr. * g10/tdbdump.c (export_ownertrust): Use estream fucntions. (import_ownertrust): Ditto. * g10/tdbio.c (tdbio_dump_record): Ditto. Change arg to estream_t. -- Reported-by: Guilhem Moulin <guilhem@fripost.org> Needed for unattended key edits with --status-fd, because since 2.1 status prompts are preceded by es_fflush (in cpr.c:do_get_from_fd) not fflush(3), so the standard output may not be flushed before each prompt. (Which breaks scripts using select(2) to multiplex between the standard and status outputs.) His patch only affected print_and_check_one_sig_colon() but there are many more places where stdio and estream are mixed. This patch now replaces most of them in g10/. At some places stdio is still used, but that is local to a function and should not have side effects. Signed-off-by: Werner Koch <wk@gnupg.org>
235 lines
5.9 KiB
C
235 lines
5.9 KiB
C
/* tdbdump.c
|
|
* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <ctype.h>
|
|
#include <assert.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
|
|
#include "gpg.h"
|
|
#include "status.h"
|
|
#include "iobuf.h"
|
|
#include "keydb.h"
|
|
#include "util.h"
|
|
#include "trustdb.h"
|
|
#include "options.h"
|
|
#include "packet.h"
|
|
#include "main.h"
|
|
#include "i18n.h"
|
|
#include "tdbio.h"
|
|
|
|
|
|
#define HEXTOBIN(x) ( (x) >= '0' && (x) <= '9' ? ((x)-'0') : \
|
|
(x) >= 'A' && (x) <= 'F' ? ((x)-'A'+10) : ((x)-'a'+10))
|
|
|
|
|
|
/****************
|
|
* Wirte a record but die on error
|
|
*/
|
|
static void
|
|
write_record( TRUSTREC *rec )
|
|
{
|
|
int rc = tdbio_write_record( rec );
|
|
if( !rc )
|
|
return;
|
|
log_error(_("trust record %lu, type %d: write failed: %s\n"),
|
|
rec->recnum, rec->rectype, gpg_strerror (rc) );
|
|
tdbio_invalid();
|
|
}
|
|
|
|
|
|
/****************
|
|
* Dump the entire trustdb or only the entries of one key.
|
|
*/
|
|
void
|
|
list_trustdb( const char *username )
|
|
{
|
|
TRUSTREC rec;
|
|
|
|
(void)username;
|
|
|
|
init_trustdb();
|
|
/* For now we ignore the user ID. */
|
|
if (1)
|
|
{
|
|
ulong recnum;
|
|
int i;
|
|
|
|
es_printf ("TrustDB: %s\n", tdbio_get_dbname() );
|
|
for(i=9+strlen(tdbio_get_dbname()); i > 0; i-- )
|
|
es_putc ('-', es_stdout);
|
|
es_putc ('\n', es_stdout);
|
|
for(recnum=0; !tdbio_read_record( recnum, &rec, 0); recnum++ )
|
|
tdbio_dump_record (&rec, es_stdout);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
* Print a list of all defined owner trust value.
|
|
*/
|
|
void
|
|
export_ownertrust()
|
|
{
|
|
TRUSTREC rec;
|
|
ulong recnum;
|
|
int i;
|
|
byte *p;
|
|
|
|
init_trustdb();
|
|
es_printf (_("# List of assigned trustvalues, created %s\n"
|
|
"# (Use \"gpg --import-ownertrust\" to restore them)\n"),
|
|
asctimestamp( make_timestamp() ) );
|
|
for (recnum=0; !tdbio_read_record (recnum, &rec, 0); recnum++ )
|
|
{
|
|
if (rec.rectype == RECTYPE_TRUST)
|
|
{
|
|
if (!rec.r.trust.ownertrust)
|
|
continue;
|
|
p = rec.r.trust.fingerprint;
|
|
for (i=0; i < 20; i++, p++ )
|
|
es_printf("%02X", *p );
|
|
es_printf (":%u:\n", (unsigned int)rec.r.trust.ownertrust );
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
import_ownertrust( const char *fname )
|
|
{
|
|
estream_t fp;
|
|
int is_stdin=0;
|
|
char line[256];
|
|
char *p;
|
|
size_t n, fprlen;
|
|
unsigned int otrust;
|
|
byte fpr[20];
|
|
int any = 0;
|
|
int rc;
|
|
|
|
init_trustdb();
|
|
if( iobuf_is_pipe_filename (fname) ) {
|
|
fp = es_stdin;
|
|
fname = "[stdin]";
|
|
is_stdin = 1;
|
|
}
|
|
else if( !(fp = es_fopen( fname, "r" )) ) {
|
|
log_error ( _("can't open '%s': %s\n"), fname, strerror(errno) );
|
|
return;
|
|
}
|
|
|
|
if (is_secured_file (es_fileno (fp)))
|
|
{
|
|
es_fclose (fp);
|
|
gpg_err_set_errno (EPERM);
|
|
log_error (_("can't open '%s': %s\n"), fname, strerror(errno) );
|
|
return;
|
|
}
|
|
|
|
while (es_fgets (line, DIM(line)-1, fp)) {
|
|
TRUSTREC rec;
|
|
|
|
if( !*line || *line == '#' )
|
|
continue;
|
|
n = strlen(line);
|
|
if( line[n-1] != '\n' ) {
|
|
log_error (_("error in '%s': %s\n"), fname, _("line too long") );
|
|
/* ... or last line does not have a LF */
|
|
break; /* can't continue */
|
|
}
|
|
for(p = line; *p && *p != ':' ; p++ )
|
|
if( !hexdigitp(p) )
|
|
break;
|
|
if( *p != ':' ) {
|
|
log_error (_("error in '%s': %s\n"), fname, _("colon missing") );
|
|
continue;
|
|
}
|
|
fprlen = p - line;
|
|
if( fprlen != 32 && fprlen != 40 ) {
|
|
log_error (_("error in '%s': %s\n"),
|
|
fname, _("invalid fingerprint") );
|
|
continue;
|
|
}
|
|
if( sscanf(p, ":%u:", &otrust ) != 1 ) {
|
|
log_error (_("error in '%s': %s\n"),
|
|
fname, _("ownertrust value missing"));
|
|
continue;
|
|
}
|
|
if( !otrust )
|
|
continue; /* no otrust defined - no need to update or insert */
|
|
/* convert the ascii fingerprint to binary */
|
|
for(p=line, fprlen=0; fprlen < 20 && *p != ':'; p += 2 )
|
|
fpr[fprlen++] = HEXTOBIN(p[0]) * 16 + HEXTOBIN(p[1]);
|
|
while (fprlen < 20)
|
|
fpr[fprlen++] = 0;
|
|
|
|
rc = tdbio_search_trust_byfpr (fpr, &rec);
|
|
if( !rc ) { /* found: update */
|
|
if (rec.r.trust.ownertrust != otrust)
|
|
{
|
|
if( rec.r.trust.ownertrust )
|
|
log_info("changing ownertrust from %u to %u\n",
|
|
rec.r.trust.ownertrust, otrust );
|
|
else
|
|
log_info("setting ownertrust to %u\n", otrust );
|
|
rec.r.trust.ownertrust = otrust;
|
|
write_record (&rec );
|
|
any = 1;
|
|
}
|
|
}
|
|
else if( rc == -1 ) { /* not found: insert */
|
|
log_info("inserting ownertrust of %u\n", otrust );
|
|
memset (&rec, 0, sizeof rec);
|
|
rec.recnum = tdbio_new_recnum ();
|
|
rec.rectype = RECTYPE_TRUST;
|
|
memcpy (rec.r.trust.fingerprint, fpr, 20);
|
|
rec.r.trust.ownertrust = otrust;
|
|
write_record (&rec );
|
|
any = 1;
|
|
}
|
|
else /* error */
|
|
log_error (_("error finding trust record in '%s': %s\n"),
|
|
fname, gpg_strerror (rc));
|
|
}
|
|
if (es_ferror (fp))
|
|
log_error ( _("read error in '%s': %s\n"), fname, strerror(errno) );
|
|
if (!is_stdin)
|
|
es_fclose (fp);
|
|
|
|
if (any)
|
|
{
|
|
revalidation_mark ();
|
|
rc = tdbio_sync ();
|
|
if (rc)
|
|
log_error (_("trustdb: sync failed: %s\n"), gpg_strerror (rc) );
|
|
}
|
|
|
|
}
|