mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Support a confirm flag for ssh.
This implements the suggestion from bug#1349. With this change the fingerprint of the ssh key is also displayed in the pinentry prompts.
This commit is contained in:
parent
172c30bc1c
commit
d4c7a55958
8 changed files with 264 additions and 130 deletions
|
@ -123,21 +123,8 @@ endif
|
|||
#
|
||||
# Module tests
|
||||
#
|
||||
<<<<<<< HEAD
|
||||
module_tests = t-convert t-percent t-gettime t-sysutils t-sexputil t-exechelp \
|
||||
t-session-env
|
||||
=======
|
||||
t_jnlib_src = t-support.c t-support.h
|
||||
jnlib_tests = t-stringhelp t-timestuff
|
||||
if HAVE_W32_SYSTEM
|
||||
jnlib_tests += t-w32-reg
|
||||
endif
|
||||
module_tests = t-convert t-percent t-gettime t-sysutils t-sexputil \
|
||||
t-session-env t-openpgp-oid t-ssh-utils
|
||||
if !HAVE_W32CE_SYSTEM
|
||||
module_tests += t-exechelp
|
||||
endif
|
||||
>>>>>>> New functions to compute an ssh style fingerprint.
|
||||
t-session-env t-ssh-utils
|
||||
module_maint_tests = t-helpfile t-b64
|
||||
|
||||
t_common_ldadd = libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a \
|
||||
|
@ -152,9 +139,4 @@ t_sexputil_LDADD = $(t_common_ldadd)
|
|||
t_b64_LDADD = $(t_common_ldadd)
|
||||
t_exechelp_LDADD = $(t_common_ldadd)
|
||||
t_session_env_LDADD = $(t_common_ldadd)
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
t_openpgp_oid_LDADD = $(t_common_ldadd)
|
||||
t_ssh_utils_LDADD = $(t_common_ldadd)
|
||||
>>>>>>> New functions to compute an ssh style fingerprint.
|
||||
|
|
|
@ -27,13 +27,6 @@
|
|||
#include "util.h"
|
||||
#include "ssh-utils.h"
|
||||
|
||||
#define pass() do { ; } while(0)
|
||||
#define fail(a,e) \
|
||||
do { fprintf (stderr, "%s:%d: test %d failed (%s)\n", \
|
||||
__FILE__,__LINE__, (a), gpg_strerror (e)); \
|
||||
exit (1); \
|
||||
} while(0)
|
||||
|
||||
|
||||
static struct { const char *key; const char *fpr; } sample_keys[] = {
|
||||
{ "(protected-private-key "
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue