Attachment #1815 for bug #1737

View | Details | Raw Unified | Return to bug 1737
Collapse All | Expand All





#include "includes.h"

#ifdef ENABLE_PKCS11

#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>

#include "authfd.h"
#include "ssh-pkcs11.h"

#ifdef ENABLE_PKCS11

/* borrows code from sftp-server and ssh-agent */

struct pkcs11_keyinfo {

Return to bug 1737

Lines 17-24 Link Here

(-)ssh-pkcs11-helper.c.old (-2 / +2 lines)
17		17
18	#include "includes.h"	18	#include "includes.h"
19		19
20	#ifdef ENABLE_PKCS11
21
22	#include <sys/types.h>	20	#include <sys/types.h>
23	#ifdef HAVE_SYS_TIME_H	21	#ifdef HAVE_SYS_TIME_H
24	# include <sys/time.h>	22	# include <sys/time.h>
Lines 39-44 Link Here
39	#include "authfd.h"	37	#include "authfd.h"
40	#include "ssh-pkcs11.h"	38	#include "ssh-pkcs11.h"
41		39
		40	#ifdef ENABLE_PKCS11
		41
42	/* borrows code from sftp-server and ssh-agent */	42	/* borrows code from sftp-server and ssh-agent */
43		43
44	struct pkcs11_keyinfo {	44	struct pkcs11_keyinfo {