mirror of
git://git.gnupg.org/gnupg.git
synced 2025-02-22 19:58:29 +01:00
gpgsm: Remove unused function.
* sm/misc.c (setup_pinentry_env): Remove.
This commit is contained in:
parent
503c9e3451
commit
8c753cb7c9
@ -571,7 +571,6 @@ int gpgsm_dirmngr_run_command (ctrl_t ctrl, const char *command,
|
||||
|
||||
/*-- misc.c --*/
|
||||
void gpgsm_print_further_info (const char *format, ...) GPGRT_ATTR_PRINTF(1,2);
|
||||
void setup_pinentry_env (void);
|
||||
gpg_error_t transform_sigval (const unsigned char *sigval, size_t sigvallen,
|
||||
int mdalgo,
|
||||
unsigned char **r_newsigval,
|
||||
|
57
sm/misc.c
57
sm/misc.c
@ -56,63 +56,6 @@ gpgsm_print_further_info (const char *format, ...)
|
||||
}
|
||||
|
||||
|
||||
/* Setup the environment so that the pinentry is able to get all
|
||||
required information. This is used prior to an exec of the
|
||||
protect-tool. */
|
||||
void
|
||||
setup_pinentry_env (void)
|
||||
{
|
||||
#ifndef HAVE_W32_SYSTEM
|
||||
char *lc;
|
||||
const char *name, *value;
|
||||
int iterator;
|
||||
|
||||
/* Try to make sure that GPG_TTY has been set. This is needed if we
|
||||
call for example the protect-tools with redirected stdin and thus
|
||||
it won't be able to ge a default by itself. Try to do it here
|
||||
but print a warning. */
|
||||
value = session_env_getenv (opt.session_env, "GPG_TTY");
|
||||
if (value)
|
||||
gnupg_setenv ("GPG_TTY", value, 1);
|
||||
else if (!(lc=getenv ("GPG_TTY")) || !*lc)
|
||||
{
|
||||
log_error (_("GPG_TTY has not been set - "
|
||||
"using maybe bogus default\n"));
|
||||
lc = gnupg_ttyname (0);
|
||||
if (!lc)
|
||||
lc = "/dev/tty";
|
||||
gnupg_setenv ("GPG_TTY", lc, 1);
|
||||
}
|
||||
|
||||
if (opt.lc_ctype)
|
||||
gnupg_setenv ("LC_CTYPE", opt.lc_ctype, 1);
|
||||
#if defined(HAVE_SETLOCALE) && defined(LC_CTYPE)
|
||||
else if ( (lc = setlocale (LC_CTYPE, "")) )
|
||||
gnupg_setenv ("LC_CTYPE", lc, 1);
|
||||
#endif
|
||||
|
||||
if (opt.lc_messages)
|
||||
gnupg_setenv ("LC_MESSAGES", opt.lc_messages, 1);
|
||||
#if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)
|
||||
else if ( (lc = setlocale (LC_MESSAGES, "")) )
|
||||
gnupg_setenv ("LC_MESSAGES", lc, 1);
|
||||
#endif
|
||||
|
||||
iterator = 0;
|
||||
while ((name = session_env_list_stdenvnames (&iterator, NULL)))
|
||||
{
|
||||
if (!strcmp (name, "GPG_TTY"))
|
||||
continue; /* Already set. */
|
||||
value = session_env_getenv (opt.session_env, name);
|
||||
if (value)
|
||||
gnupg_setenv (name, value, 1);
|
||||
}
|
||||
|
||||
#endif /*!HAVE_W32_SYSTEM*/
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Transform a sig-val style s-expression as returned by Libgcrypt to
|
||||
one which includes an algorithm identifier encoding the public key
|
||||
and the hash algorithm. The public key algorithm is taken directly
|
||||
|
Loading…
x
Reference in New Issue
Block a user