mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-22 01:50:16 +00:00
- (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
Make it compile on OSX
This commit is contained in:
parent
d8f6002272
commit
8ad0fbd98e
@ -40,6 +40,8 @@
|
||||
- (djm) [INSTALL Makefile.in README.smartcard configure.ac scard-opensc.c]
|
||||
[scard.c scard.h pkcs11.h scard/Makefile.in scard/Ssh.bin.uu scard/Ssh.java]
|
||||
Remove obsolete smartcard support
|
||||
- (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
|
||||
Make it compile on OSX
|
||||
|
||||
20100210
|
||||
- (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for
|
||||
|
@ -14,8 +14,12 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
#endif
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
|
@ -14,9 +14,14 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <sys/queue.h>
|
||||
#include "includes.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#include "openbsd-compat/sys-queue.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
|
12
ssh-pkcs11.c
12
ssh-pkcs11.c
@ -14,14 +14,20 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
#endif
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
#include "openbsd-compat/sys-queue.h"
|
||||
|
||||
#define CRYPTOKI_COMPAT
|
||||
#include "pkcs11.h"
|
||||
|
||||
@ -190,14 +196,14 @@ pkcs11_rsa_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa,
|
||||
CK_ULONG tlen = 0, nfound = 0;
|
||||
CK_RV rv;
|
||||
CK_OBJECT_CLASS private_key_class = CKO_PRIVATE_KEY;
|
||||
CK_BBOOL true = CK_TRUE;
|
||||
CK_BBOOL true_val = CK_TRUE;
|
||||
CK_MECHANISM mech = {
|
||||
CKM_RSA_PKCS, NULL_PTR, 0
|
||||
};
|
||||
CK_ATTRIBUTE key_filter[] = {
|
||||
{CKA_CLASS, &private_key_class, sizeof(private_key_class) },
|
||||
{CKA_ID, NULL, 0},
|
||||
{CKA_SIGN, &true, sizeof(true) }
|
||||
{CKA_SIGN, &true_val, sizeof(true_val) }
|
||||
};
|
||||
char *pin, prompt[1024];
|
||||
int rval = -1;
|
||||
|
Loading…
Reference in New Issue
Block a user