mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-07 23:27:48 +02:00
faef9f929b
%0A may pass through. * agent.h (server_control_s): New field USE_AUTH_CALL. * call-scd.c (agent_card_pksign): Make use of it. * command-ssh.c (data_sign): Set the flag. (ssh_send_key_public): New arg OVERRIDE_COMMENT. (card_key_available): Add new arg CARDSN. (ssh_handler_request_identities): Use the card s/n as comment. (sexp_key_extract): Use GCRYMPI_FMT_STD. (data_sign): Ditto. * learncard.c (make_shadow_info): Moved to .. * protect.c (make_shadow_info): .. here. Return NULL on malloc failure. Made global. * agent.h: Add prototype. * xasprintf.c (xtryasprintf): New. * app-openpgp.c (get_public_key): Make sure not to return negative numbers. (do_sign): Allow passing of indata with algorithm prefix. (do_auth): Allow OPENPGP.3 as an alternative ID. * app.c (app_getattr): Return just the S/N but not the timestamp. * no-libgcrypt.c (gcry_strdup): New.
63 lines
1.6 KiB
C
63 lines
1.6 KiB
C
/* xasprintf.c
|
|
* Copyright (C) 2003, 2005 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 2 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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
|
|
#include "util.h"
|
|
#include "iobuf.h"
|
|
|
|
/* Same as asprintf but return an allocated buffer suitable to be
|
|
freed using xfree. This function simply dies on memory failure,
|
|
thus no extra check is required. */
|
|
char *
|
|
xasprintf (const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
char *buf, *p;
|
|
|
|
va_start (ap, fmt);
|
|
if (vasprintf (&buf, fmt, ap) < 0)
|
|
log_fatal ("asprintf failed: %s\n", strerror (errno));
|
|
va_end (ap);
|
|
p = xstrdup (buf);
|
|
free (buf);
|
|
return p;
|
|
}
|
|
|
|
/* Same as above bit return NULL on memory failure. */
|
|
char *
|
|
xtryasprintf (const char *fmt, ...)
|
|
{
|
|
int rc;
|
|
va_list ap;
|
|
char *buf, *p;
|
|
|
|
va_start (ap, fmt);
|
|
rc = vasprintf (&buf, fmt, ap);
|
|
va_end (ap);
|
|
if (rc < 0)
|
|
return NULL;
|
|
p = xtrystrdup (buf);
|
|
free (buf);
|
|
return p;
|
|
}
|