mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-02 22:38:02 +02:00
5105c8d2d3
* agent/gpg-agent.c [W32]: Include Several Windows header.
(opts): Change help text for enable-ssh-support.
(opts, main): Add option --enable-putty-support
(putty_support, PUTTY_IPC_MAGIC, PUTTY_IPC_MAXLEN): New for W32.
(agent_init_default_ctrl): Add and asssert call.
(putty_message_proc, putty_message_thread): New.
(handle_connections) [W32]: Start putty message thread.
* common/sysutils.c (w32_get_user_sid): New for W32 only
* tools/gpgconf-comp.c (gc_options_gpg_agent): Add
--enable-ssh-support and --enable-putty-support. Make the
configuration group visible at basic level.
* agent/command-ssh.c (serve_mmapped_ssh_request): New for W32 only.
--
This patch enables support for Putty. It has been tested with Putty
0.62 using an Unix created ssh key copied to the private-keys-v1.d
directory on Windows and with a manually crafted sshcontrol file. It
also works with a smartcard key.
May thanks to gniibe who implemented a proxy in Python to test the
putty/gpg-agent communication.
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 9f32499f99)
Resolved conflicts:
NEWS
agent/agent.h
agent/gpg-agent.c: Convert from pth to npth.
common/sysutils.c
common/sysutils.h
75 lines
2.4 KiB
C
75 lines
2.4 KiB
C
/* sysutils.h - System utility functions for Gnupg
|
|
* Copyright (C) 2002 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* This file is free software; you can redistribute it and/or modify
|
|
* it under the terms of either
|
|
*
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or
|
|
*
|
|
* - 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.
|
|
*
|
|
* or both in parallel, as here.
|
|
*
|
|
* This file 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/>.
|
|
*/
|
|
|
|
#ifndef GNUPG_COMMON_SYSUTILS_H
|
|
#define GNUPG_COMMON_SYSUTILS_H
|
|
|
|
/* Because we use system handles and not libc low level file
|
|
descriptors on W32, we need to declare them as HANDLE (which
|
|
actually is a plain pointer). This is required to eventually
|
|
support 64 bits Windows systems. */
|
|
#ifdef HAVE_W32_SYSTEM
|
|
typedef void *gnupg_fd_t;
|
|
#define GNUPG_INVALID_FD ((void*)(-1))
|
|
#define INT2FD(s) ((void *)(s))
|
|
#define FD2INT(h) ((unsigned int)(h))
|
|
#else
|
|
typedef int gnupg_fd_t;
|
|
#define GNUPG_INVALID_FD (-1)
|
|
#define INT2FD(s) (s)
|
|
#define FD2INT(h) (h)
|
|
#endif
|
|
|
|
|
|
void trap_unaligned (void);
|
|
int disable_core_dumps (void);
|
|
int enable_core_dumps (void);
|
|
const unsigned char *get_session_marker (size_t *rlen);
|
|
unsigned int get_uint_nonce (void);
|
|
/*int check_permissions (const char *path,int extension,int checkonly);*/
|
|
void gnupg_sleep (unsigned int seconds);
|
|
int translate_sys2libc_fd (gnupg_fd_t fd, int for_write);
|
|
int translate_sys2libc_fd_int (int fd, int for_write);
|
|
FILE *gnupg_tmpfile (void);
|
|
void gnupg_reopen_std (const char *pgmname);
|
|
void gnupg_allow_set_foregound_window (pid_t pid);
|
|
int gnupg_remove (const char *fname);
|
|
int gnupg_mkdir (const char *name, const char *modestr);
|
|
int gnupg_setenv (const char *name, const char *value, int overwrite);
|
|
int gnupg_unsetenv (const char *name);
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
void *w32_get_user_sid (void);
|
|
|
|
#include "../common/w32help.h"
|
|
|
|
#endif /*HAVE_W32_SYSTEM*/
|
|
|
|
#endif /*GNUPG_COMMON_SYSUTILS_H*/
|