james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

reorder includes so openssl includes fix X509_NAME on windows

Browse Source
This commit is contained in:
Klas Lindfors
2014-02-07 15:12:16 +01:00
parent 37b7da60f2
commit 164812abfc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yubico-piv-tool.c
+6 -6
View File
@@ -32,11 +32,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <openssl/des.h>
#include <openssl/pem.h>
#include <openssl/pkcs12.h>
#include <openssl/rand.h>
#if BACKEND_PCSC #if BACKEND_PCSC
#if defined HAVE_PCSC_WINSCARD_H #if defined HAVE_PCSC_WINSCARD_H
# include <PCSC/wintypes.h> # include <PCSC/wintypes.h>
@@ -46,6 +41,11 @@
#endif #endif
#endif #endif
#include <openssl/des.h>
#include <openssl/pem.h>
#include <openssl/pkcs12.h>
#include <openssl/rand.h>
#include "cmdline.h" #include "cmdline.h"
unsigned const char aid[] = { unsigned const char aid[] = {
@@ -89,7 +89,7 @@ typedef union u_APDU APDU;
static void dump_hex(unsigned const char*, unsigned int); static void dump_hex(unsigned const char*, unsigned int);
static int send_data(SCARDHANDLE*, APDU*, unsigned char*, unsigned long*, int); static int send_data(SCARDHANDLE*, APDU*, unsigned char*, unsigned long*, int);
static int set_length(unsigned char*, int); static int set_length(unsigned char*, int);
static int get_length(unsigned char*, int *); static int get_length(unsigned char*, int*);
static X509_NAME *parse_name(char*); static X509_NAME *parse_name(char*);
static unsigned char get_algorithm(EVP_PKEY*); static unsigned char get_algorithm(EVP_PKEY*);