In-house patch created to clear any merge conflicts from source in archive

repo to build properly on Solaris.

--- CACKey-0.7.4/cackey.c	2016-05-19 14:16:48.230399914 -0400

+++ CACKey-0.7.4/cackey.c	2015-07-16 12:20:20.000000000 -0400

@@ -35,13 +35,10 @@

 #ifdef HAVE_STDIO_H

 #  include <stdio.h>

 #endif

-<<<<<<< HEAD

-=======

 #define HAVE_ERRNO_H 1

 #ifdef HAVE_ERRNO_H

 #  include <errno.h>

 #endif

->>>>>>> trunk

 #ifdef HAVE_ZLIB_H

 #  ifdef HAVE_LIBZ

 #    include <zlib.h>

@@ -51,12 +48,9 @@

 #    undef HAVE_LIBZ

 #  endif

 #endif

-<<<<<<< HEAD

-=======

 #ifdef CACKEY_DEBUG_SEARCH_SPEEDTEST

 #  include <sys/time.h>

 #endif

->>>>>>> trunk

 #define CK_PTR *

 #define CK_DEFINE_FUNCTION(returnType, name) returnType name

@@ -73,17 +67,6 @@

 #include "sha1.h"

 #include "md5.h"

-<<<<<<< HEAD

-/*

- * Include these source files in this translation unit so that we can bind to

- * functions and not include any symbols in the output shared object.

- */

-#include "asn1-x509.c"

-#include "sha1.c"

-#include "md5.c"

-

-=======

->>>>>>> trunk

 #ifndef CACKEY_CRYPTOKI_VERSION_CODE

 #  define CACKEY_CRYPTOKI_VERSION_CODE 0x021e00

 #endif

@@ -102,10 +85,7 @@

 #define GSCIS_INSTR_GET_CHALLENGE     0x84

 #define GSCIS_INSTR_INTERNAL_AUTH     0x88

 #define GSCIS_INSTR_VERIFY            0x20

-<<<<<<< HEAD

-=======

 #define GSCIS_INSTR_CHANGE_REFERENCE  0x24

->>>>>>> trunk

 #define GSCIS_INSTR_SIGN              0x2A

 #define GSCIS_INSTR_GET_PROP          0x56

 #define GSCIS_INSTR_GET_ACR           0x4C

@@ -173,13 +153,10 @@

 #define GSCIS_TAG_SECURITY_CODE       0x57

 #define GSCIS_TAG_CARDID_AID          0x58

-<<<<<<< HEAD

-=======

 /*** PIV Codes ***/

 #define NISTSP800_73_3_INSTR_GET_DATA 0xCB

 #define NISTSP800_73_3_INSTR_GENAUTH  0x87

->>>>>>> trunk

 /*** PKI Information - EF 7000 ***/

 #define GSCIS_TAG_CERTIFICATE         0x70

 #define GSCIS_TAG_CERT_ISSUE_DATE     0x71

@@ -187,8 +164,6 @@

 /** Applet IDs **/

 #define GSCIS_AID_CCC                 0xA0, 0x00, 0x00, 0x01, 0x16, 0xDB, 0x00

-<<<<<<< HEAD

-=======

 #define NISTSP800_73_3_PIV_AID        0xA0, 0x00, 0x00, 0x03, 0x08, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00

 /* PIV IDs */

@@ -207,7 +182,6 @@

 #define NISTSP800_73_3_OID_SIGNATURE 0x5F, 0xC1, 0x0A

 #define NISTSP800_73_3_OID_KEYMGT    0x5F, 0xC1, 0x0B

 #define NISTSP800_73_3_OID_CARDAUTH  0x5F, 0xC1, 0x01

->>>>>>> trunk

 /* Maximum size of data portion of APDUs */

 /** Do not set this above 250 **/

@@ -222,17 +196,6 @@

 #  ifdef HAVE_TIME_H

 #    include <time.h>

 static time_t cackey_debug_start_time = 0;

-<<<<<<< HEAD

-#    define CACKEY_DEBUG_PRINTTIME { if (cackey_debug_start_time == 0) { cackey_debug_start_time = time(NULL); }; fprintf(cackey_debug_fd(), "[%lu]: ", (unsigned long) (time(NULL) - cackey_debug_start_time)); }

-#  else

-#    define CACKEY_DEBUG_PRINTTIME /**/

-#  endif

-

-#  define CACKEY_DEBUG_PRINTF(x...) { CACKEY_DEBUG_PRINTTIME; fprintf(cackey_debug_fd(), "%s():%i: ", __func__, __LINE__); fprintf(cackey_debug_fd(), x); fprintf(cackey_debug_fd(), "\n"); fflush(cackey_debug_fd()); }

-#  define CACKEY_DEBUG_PRINTBUF(f, x, y) { unsigned char *TMPBUF; unsigned long idx; TMPBUF = (unsigned char *) (x); CACKEY_DEBUG_PRINTTIME; fprintf(cackey_debug_fd(), "%s():%i: %s  (%s/%lu = {%02x", __func__, __LINE__, f, #x, (unsigned long) (y), TMPBUF[0]); for (idx = 1; idx < (y); idx++) { fprintf(cackey_debug_fd(), ", %02x", TMPBUF[idx]); }; fprintf(cackey_debug_fd(), "})\n"); fflush(cackey_debug_fd()); }

-#  define CACKEY_DEBUG_PERROR(x) { fprintf(cackey_debug_fd(), "%s():%i: ", __func__, __LINE__); CACKEY_DEBUG_PRINTTIME; perror(x); fflush(cackey_debug_fd()); }

-#  define free(x) { CACKEY_DEBUG_PRINTF("FREE(%p) (%s)", x, #x); free(x); }

-=======

 static unsigned long CACKEY_DEBUG_GETTIME(void) {

 	if (cackey_debug_start_time == 0) {

 		cackey_debug_start_time = time(NULL);

@@ -254,17 +217,16 @@

 	fflush(cackey_debug_fd()); \

 }

 #  define CACKEY_DEBUG_PRINTBUF(f, x, y) { \

-	static char buf_user[4096] = {0}, *buf_user_p, *buf_user_print; \

+	static char buf_user[4096] = {0}, *buf_user_p; \

 	unsigned long buf_user_size; \

 	unsigned char *TMPBUF; \

 	unsigned long idx; \

 	int snprintf_ret; \

 	TMPBUF = (unsigned char *) (x); \

 	buf_user[0] = 0; \

-	buf_user[2] = 0; \

 	buf_user_p = buf_user; \

 	buf_user_size = sizeof(buf_user); \

-	for (idx = 0; idx < (y); idx++) { \

+	for (idx = 1; idx < (y); idx++) { \

 		if (buf_user_size <= 0) { \

 			break; \

 		}; \

@@ -276,12 +238,10 @@

 		buf_user_size -= snprintf_ret; \

 	}; \

 	buf_user[sizeof(buf_user) - 1] = '\0'; \

-	buf_user_print = buf_user + 2; \

-	fprintf(cackey_debug_fd(), "[%lu]: %s():%i: %s  (%s/%lu = {%s})\n", CACKEY_DEBUG_GETTIME(), __func__, __LINE__, f, #x, (unsigned long) (y), buf_user_print); \

+	fprintf(cackey_debug_fd(), "[%lu]: %s():%i: %s  (%s/%lu = {%02x%s})\n", CACKEY_DEBUG_GETTIME(), __func__, __LINE__, f, #x, (unsigned long) (y), TMPBUF[0], buf_user); \

 	fflush(cackey_debug_fd()); \

 }

 #  define free(x) { CACKEY_DEBUG_PRINTF("FREE(%p) (%s)", (void *) x, #x); free(x); }

->>>>>>> trunk

 static FILE *cackey_debug_fd(void) {

 	static FILE *fd = NULL;

@@ -309,15 +269,12 @@

 		}

 	}

-<<<<<<< HEAD

-=======

 #ifdef CACKEY_DEBUG_LOGFILE

 	if (logfile == NULL) {

 		logfile = CACKEY_DEBUG_LOGFILE;

 	}

 #endif

->>>>>>> trunk

 	if (logfile != NULL) {

 		CACKEY_DEBUG_PRINTF("Found log file: %s", logfile);

@@ -331,11 +288,7 @@

 	if (fd == stderr) {

 		CACKEY_DEBUG_PRINTF("Returning stderr");

 	} else {

-<<<<<<< HEAD

-		CACKEY_DEBUG_PRINTF("Returning %p", fd);

-=======

 		CACKEY_DEBUG_PRINTF("Returning %p", (void *) fd);

->>>>>>> trunk

 	}

 	return(fd);

@@ -346,14 +299,7 @@

 	retval = malloc(size);

-<<<<<<< HEAD

-	CACKEY_DEBUG_PRINTTIME;

-	fprintf(cackey_debug_fd(), "%s():%i: ", func, line);

-	fprintf(cackey_debug_fd(), "MALLOC() = %p", retval);

-	fprintf(cackey_debug_fd(), "\n");

-=======

 	fprintf(cackey_debug_fd(), "[%lu]: %s():%i: MALLOC() = %p\n", CACKEY_DEBUG_GETTIME(), func, line, retval);

->>>>>>> trunk

 	fflush(cackey_debug_fd());

 	return(retval);

@@ -365,14 +311,7 @@

 	retval = realloc(ptr, size);

 	if (retval != ptr) {

-<<<<<<< HEAD

-		CACKEY_DEBUG_PRINTTIME;

-		fprintf(cackey_debug_fd(), "%s():%i: ", func, line);

-		fprintf(cackey_debug_fd(), "REALLOC(%p) = %p", ptr, retval);

-		fprintf(cackey_debug_fd(), "\n");

-=======

 		fprintf(cackey_debug_fd(), "[%lu]: %s():%i: REALLOC(%p) = %p\n", CACKEY_DEBUG_GETTIME(), func, line, ptr, retval);

->>>>>>> trunk

 		fflush(cackey_debug_fd());

 	}

@@ -388,14 +327,7 @@

 	retval = strdup(ptr);

-<<<<<<< HEAD

-	CACKEY_DEBUG_PRINTTIME;

-	fprintf(cackey_debug_fd(), "%s():%i: ", func, line);

-	fprintf(cackey_debug_fd(), "STRDUP_MALLOC() = %p", retval);

-	fprintf(cackey_debug_fd(), "\n");

-=======

 	fprintf(cackey_debug_fd(), "[%lu]: %s():%i: STRDUP_MALLOC() = %p\n", CACKEY_DEBUG_GETTIME(), func, line, retval);

->>>>>>> trunk

 	fflush(cackey_debug_fd());

 	return(retval);

@@ -777,10 +709,6 @@

 #else

 #  define CACKEY_DEBUG_PRINTF(x...) /**/

 #  define CACKEY_DEBUG_PRINTBUF(f, x, y) /**/

-<<<<<<< HEAD

-#  define CACKEY_DEBUG_PERROR(x) /**/

-=======

->>>>>>> trunk

 #  define CACKEY_DEBUG_FUNC_TAG_TO_STR(x) "DEBUG_DISABLED"

 #  define CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(x) "DEBUG_DISABLED"

 #  define CACKEY_DEBUG_FUNC_OBJID_TO_STR(x) "DEBUG_DISABLED"

@@ -788,11 +716,6 @@

 #  define CACKEY_DEBUG_FUNC_ATTRIBUTE_TO_STR(x) "DEBUG_DISABLED"

 #endif

-<<<<<<< HEAD

-struct cackey_pcsc_identity {

-	unsigned char applet[7];

-	uint16_t file;

-=======

 /*

  * Include these source files in this translation unit so that we can bind to

  * functions and not include any symbols in the output shared object.

@@ -809,14 +732,11 @@

 struct cackey_pcsc_identity {

 	cackey_pcsc_id_type id_type;

->>>>>>> trunk

 	size_t certificate_len;

 	unsigned char *certificate;

 	ssize_t keysize;

-<<<<<<< HEAD

-=======

 	union {

 		struct {

@@ -829,7 +749,6 @@

 			char label[32];

 		} piv;

 	} card;

->>>>>>> trunk

 };

 struct cackey_identity {

@@ -874,10 +793,7 @@

 struct cackey_slot {

 	int active;

-<<<<<<< HEAD

-=======

 	int internal;

->>>>>>> trunk

 	char *pcsc_reader;

@@ -894,12 +810,9 @@

 	unsigned char *label;

 	DWORD protocol;

-<<<<<<< HEAD

-=======

 	unsigned int cached_certs_count;

 	struct cackey_pcsc_identity *cached_certs;

->>>>>>> trunk

 };

 typedef enum {

@@ -931,12 +844,7 @@

 	CACKEY_PCSC_E_LOCKED          = -3,

 	CACKEY_PCSC_E_NEEDLOGIN       = -4,

 	CACKEY_PCSC_E_TOKENABSENT     = -6,

-<<<<<<< HEAD

 	CACKEY_PCSC_E_RETRY           = -7

-=======

-	CACKEY_PCSC_E_RETRY           = -7,

-	CACKEY_PCSC_E_NODATA          = -8

->>>>>>> trunk

 } cackey_ret;

 struct cackey_tlv_cardurl {

@@ -974,19 +882,11 @@

 #include "cackey_builtin_certs.h"

 };

-<<<<<<< HEAD

-=======

-#define CACKEY_MACRO_DEFAULT_XSTR(str) CACKEY_MACRO_DEFAULT_STR(str)

-#define CACKEY_MACRO_DEFAULT_STR(str) #str

-

 /* Protected Authentication Path command */

+#define CACKEY_PIN_COMMAND_DEFAULT_XSTR(str) CACKEY_PIN_COMMAND_DEFAULT_STR(str)

+#define CACKEY_PIN_COMMAND_DEFAULT_STR(str) #str

 static char *cackey_pin_command = NULL;

-/* Reader Exclusion or Include-only */

-static char *cackey_readers_include_only = NULL;

-static char *cackey_readers_exclude = NULL;

-

->>>>>>> trunk

 /* PCSC Global Handles */

 static LPSCARDCONTEXT cackey_pcsc_handle = NULL;

@@ -1046,14 +946,11 @@

 	CACKEY_DEBUG_PRINTF("Called.");

 	for (idx = 0; idx < (sizeof(cackey_slots) / sizeof(cackey_slots[0])); idx++) {

-<<<<<<< HEAD

-=======

 		if (cackey_slots[idx].internal) {

 			/* Skip internal slots */

 			continue;

 		}

->>>>>>> trunk

 		if (cackey_slots[idx].pcsc_card_connected) {

 			CACKEY_DEBUG_PRINTF("SCardDisconnect(%lu) called", (unsigned long) idx);

@@ -1226,15 +1123,11 @@

 	slot->slot_reset = 1;

 	slot->pcsc_card_connected = 0;

-<<<<<<< HEAD

-	slot->token_flags = CKF_LOGIN_REQUIRED;

-=======

 	if (cackey_pin_command == NULL) {

 		slot->token_flags = CKF_LOGIN_REQUIRED;

 	} else {

 		slot->token_flags = 0;

 	}

->>>>>>> trunk

 	CACKEY_DEBUG_PRINTF("Returning.");

@@ -1243,11 +1136,7 @@

 /*

  * SYNPOSIS

-<<<<<<< HEAD

- *     LONG cackey_reconnect_card(struct cackey_slot *slot, DWORD default_protocol, LPDWORD selected_protocol);

-=======

  *     LONG cackey_reconnect_card(struct cackey_slot *slot, DWORD default_protocol);

->>>>>>> trunk

  *

  * ARGUMENTS

  *     cackey_slot *slot

@@ -1256,12 +1145,6 @@

  *     DWORD default_protocol

  *         Protocol to attempt first

  *

-<<<<<<< HEAD

- *     LPDWORD selected_protocol

- *         [OUT] Protocol selected

- *

-=======

->>>>>>> trunk

  * RETURN VALUE

  *     The return value from SCardReconnect()

  *

@@ -1274,23 +1157,6 @@

  *     that T=1.

  *

  */

-<<<<<<< HEAD

-static LONG cackey_reconnect_card(struct cackey_slot *slot, DWORD default_protocol, LPDWORD selected_protocol) {

-	LONG scard_conn_ret;

-

-	scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, default_protocol, SCARD_RESET_CARD, selected_protocol);

-

-	if (scard_conn_ret == SCARD_E_PROTO_MISMATCH) {

-		CACKEY_DEBUG_PRINTF("SCardReconnect() returned SCARD_E_PROTO_MISMATCH, trying with just T=0")

-		scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, SCARD_RESET_CARD, selected_protocol);

-

-		if (scard_conn_ret == SCARD_E_PROTO_MISMATCH) {

-			CACKEY_DEBUG_PRINTF("SCardReconnect() returned SCARD_E_PROTO_MISMATCH, trying with just T=1")

-			scard_conn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T1, SCARD_RESET_CARD, selected_protocol);

-		}

-	}

-

-=======

 static LONG cackey_reconnect_card(struct cackey_slot *slot, DWORD default_protocol) {

 	DWORD selected_protocol;

 	LONG scard_conn_ret;

@@ -1313,7 +1179,6 @@

 		slot->protocol = selected_protocol;

 	}

->>>>>>> trunk

 	return(scard_conn_ret);

 }

@@ -1355,11 +1220,7 @@

 	/* Connect to reader, if needed */

 	if (!slot->pcsc_card_connected) {

-<<<<<<< HEAD

-		CACKEY_DEBUG_PRINTF("SCardConnect(%s) called", slot->pcsc_reader);

-=======

 		CACKEY_DEBUG_PRINTF("SCardConnect(%s) called for slot %p", slot->pcsc_reader, slot);

->>>>>>> trunk

 		scard_conn_ret = SCardConnect(*cackey_pcsc_handle, slot->pcsc_reader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, &slot->pcsc_card, &protocol);

 		if (scard_conn_ret == SCARD_E_PROTO_MISMATCH) {

@@ -1387,11 +1248,7 @@

 				}

 			}

-<<<<<<< HEAD

-			scard_conn_ret = cackey_reconnect_card(slot, protocol, &protocol);

-=======

 			scard_conn_ret = cackey_reconnect_card(slot, protocol);

->>>>>>> trunk

 		}

 		if (scard_conn_ret != SCARD_S_SUCCESS) {

@@ -1406,11 +1263,8 @@

 		slot->protocol = protocol;

 	}

-<<<<<<< HEAD

-=======

 	CACKEY_DEBUG_PRINTF("Returning in success");

->>>>>>> trunk

 	return(CACKEY_PCSC_S_OK);

 }

@@ -1587,12 +1441,6 @@

  *     CACKEY_PCSC_E_GENERIC      On error

  *     CACKEY_PCSC_E_TOKENABSENT  If the sending failed because the token is

  *                                absent

-<<<<<<< HEAD

-=======

- *     CACKEY_PCSC_E_RETRY        If something that looks retry'able went

- *                                wrong -- try the whole transaction over

- *                                again

->>>>>>> trunk

  *

  * NOTES

  *     This function will connect to the PC/SC Connection Manager via

@@ -1603,18 +1451,10 @@

  *     goes away.

  *

  */

-<<<<<<< HEAD

-static cackey_ret cackey_send_apdu(struct cackey_slot *slot, unsigned char class, unsigned char instruction, unsigned char p1, unsigned char p2, unsigned char lc, unsigned char *data, unsigned char le, uint16_t *respcode, unsigned char *respdata, size_t *respdata_len) {

-	uint8_t major_rc, minor_rc;

-	size_t bytes_to_copy, tmp_respdata_len;

-	LPCSCARD_IO_REQUEST pioSendPci;

-	DWORD protocol;

-=======

 static cackey_ret cackey_send_apdu(struct cackey_slot *slot, unsigned char class, unsigned char instruction, unsigned char p1, unsigned char p2, unsigned int lc, unsigned char *data, unsigned int le, uint16_t *respcode, unsigned char *respdata, size_t *respdata_len) {

 	uint8_t major_rc, minor_rc;

 	size_t bytes_to_copy, tmp_respdata_len;

 	LPCSCARD_IO_REQUEST pioSendPci;

->>>>>>> trunk

 	DWORD xmit_len, recv_len;

 	LONG scard_xmit_ret, scard_reconn_ret;

 	BYTE xmit_buf[1024], recv_buf[1024];

@@ -1639,20 +1479,14 @@

 	/* Determine which protocol to send using */

 	switch (slot->protocol) {

 		case SCARD_PROTOCOL_T0:

-<<<<<<< HEAD

-=======

 			CACKEY_DEBUG_PRINTF("Protocol to send datagram is T=0");

->>>>>>> trunk

 			pioSendPci = SCARD_PCI_T0;

 			break;

 		case SCARD_PROTOCOL_T1:

-<<<<<<< HEAD

-=======

 			CACKEY_DEBUG_PRINTF("Protocol to send datagram is T=1");

->>>>>>> trunk

 			pioSendPci = SCARD_PCI_T1;

 			break;

@@ -1669,9 +1503,6 @@

 	xmit_buf[xmit_len++] = p1;

 	xmit_buf[xmit_len++] = p2;

 	if (data) {

-<<<<<<< HEAD

-		xmit_buf[xmit_len++] = lc;

-=======

 		if (lc > 255) {

 			CACKEY_DEBUG_PRINTF("CAUTION!  Using an Lc greater than 255 is untested.  Lc = %u", lc);

@@ -1681,16 +1512,12 @@

 		} else {

 			xmit_buf[xmit_len++] = lc;

 		}

->>>>>>> trunk

 		for (idx = 0; idx < lc; idx++) {

 			xmit_buf[xmit_len++] = data[idx];

 		}

 	}

 	if (le != 0x00) {

-<<<<<<< HEAD

-		xmit_buf[xmit_len++] = le;

-=======

 		if (le > 256) {

 			CACKEY_DEBUG_PRINTF("CAUTION!  Using an Le greater than 256 is untested.  Le = %u", le);

@@ -1702,17 +1529,12 @@

 		} else {

 			xmit_buf[xmit_len++] = le;