summaryrefslogtreecommitdiff
path: root/ssh-pkcs11.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-12 09:49:06 +1100
committerDamien Miller <djm@mindrot.org>2010-02-12 09:49:06 +1100
commit8ad0fbd98e5ffd98c25f88881981336508ae90d7 (patch)
treeb5819c4170a242ac70fec9488869e9bb22508175 /ssh-pkcs11.c
parentd8f60022727f1d57efe7261b856d5e84a4b28cbe (diff)
- (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
Make it compile on OSX
Diffstat (limited to 'ssh-pkcs11.c')
-rw-r--r--ssh-pkcs11.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index f82454329..2f6c9cec8 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -14,14 +14,20 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16 16
17#include "includes.h"
18
17#include <sys/types.h> 19#include <sys/types.h>
18#include <sys/queue.h> 20#ifdef HAVE_SYS_TIME_H
21# include <sys/time.h>
22#endif
19#include <stdarg.h> 23#include <stdarg.h>
20#include <stdio.h> 24#include <stdio.h>
21 25
22#include <string.h> 26#include <string.h>
23#include <dlfcn.h> 27#include <dlfcn.h>
24 28
29#include "openbsd-compat/sys-queue.h"
30
25#define CRYPTOKI_COMPAT 31#define CRYPTOKI_COMPAT
26#include "pkcs11.h" 32#include "pkcs11.h"
27 33
@@ -190,14 +196,14 @@ pkcs11_rsa_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa,
190 CK_ULONG tlen = 0, nfound = 0; 196 CK_ULONG tlen = 0, nfound = 0;
191 CK_RV rv; 197 CK_RV rv;
192 CK_OBJECT_CLASS private_key_class = CKO_PRIVATE_KEY; 198 CK_OBJECT_CLASS private_key_class = CKO_PRIVATE_KEY;
193 CK_BBOOL true = CK_TRUE; 199 CK_BBOOL true_val = CK_TRUE;
194 CK_MECHANISM mech = { 200 CK_MECHANISM mech = {
195 CKM_RSA_PKCS, NULL_PTR, 0 201 CKM_RSA_PKCS, NULL_PTR, 0
196 }; 202 };
197 CK_ATTRIBUTE key_filter[] = { 203 CK_ATTRIBUTE key_filter[] = {
198 {CKA_CLASS, &private_key_class, sizeof(private_key_class) }, 204 {CKA_CLASS, &private_key_class, sizeof(private_key_class) },
199 {CKA_ID, NULL, 0}, 205 {CKA_ID, NULL, 0},
200 {CKA_SIGN, &true, sizeof(true) } 206 {CKA_SIGN, &true_val, sizeof(true_val) }
201 }; 207 };
202 char *pin, prompt[1024]; 208 char *pin, prompt[1024];
203 int rval = -1; 209 int rval = -1;