Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -31,11 +31,11 @@
 asn1-x509_g.o: asn1-x509.c asn1-x509.h config.h
 	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o asn1-x509_g.o -c asn1-x509.c
 
 libcackey.@SHOBJEXT@: cackey.o asn1-x509.o
 	$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey.@SHOBJEXT@ cackey.o asn1-x509.o $(LIBS)
-	-$(STRIP) -g "libcackey.@SHOBJEXT@"
+	-$(STRIP) -x "libcackey.@SHOBJEXT@"
 
 libcackey_g.@SHOBJEXT@: cackey_g.o asn1-x509_g.o
 	$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey_g.@SHOBJEXT@ cackey_g.o asn1-x509_g.o $(LIBS)
 
 test: test.c libcackey_g.@SHOBJEXT@

Index: cackey.c
==================================================================
--- cackey.c
+++ cackey.c
@@ -193,10 +193,14 @@
 		fprintf(stderr, "%s():%i: ", func, line);
 		fprintf(stderr, "REALLOC(%p) = %p", ptr, retval);
 		fprintf(stderr, "\n");
 		fflush(stderr);
 	}
+
+	if (retval == NULL) {
+		CACKEY_DEBUG_PRINTF(" *** ERROR *** realloc returned NULL");
+	}
 
 	return(retval);
 }
 
 static char *CACKEY_DEBUG_FUNC_STRDUP(const char *ptr, const char *func, int line) {
@@ -561,11 +565,11 @@
 	CACKEY_PCSC_S_OK              = 0,
 	CACKEY_PCSC_E_GENERIC         = -1,
 	CACKEY_PCSC_E_BADPIN          = -2,
 	CACKEY_PCSC_E_LOCKED          = -3,
 	CACKEY_PCSC_E_NEEDLOGIN       = -4,
-	CACKEY_PCSC_E_TOKENABSENT     = -6,
+	CACKEY_PCSC_E_TOKENABSENT     = -6
 } cackey_ret;
 
 struct cackey_tlv_cardurl {
 	unsigned char        rid[5];
 	cackey_tlv_apptype   apptype;
@@ -835,11 +839,11 @@
 	}
 
 	/* Connect to reader, if needed */
 	if (!slot->pcsc_card_connected) {
 		CACKEY_DEBUG_PRINTF("SCardConnect(%s) called", slot->pcsc_reader);
-		scard_conn_ret = SCardConnect(*cackey_pcsc_handle, slot->pcsc_reader, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, &slot->pcsc_card, &protocol);
+		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_S_SUCCESS) {
 			CACKEY_DEBUG_PRINTF("Connection to card failed, returning in failure (SCardConnect() = %s/%li)", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_conn_ret), (long) scard_conn_ret);
 
 			return(CACKEY_PCSC_E_GENERIC);
@@ -1073,11 +1077,11 @@
 	} else {
 		CACKEY_DEBUG_PRINTBUF("Sending APDU:", xmit_buf, xmit_len);
 	}
 
 	recv_len = sizeof(recv_buf);
-	scard_xmit_ret = SCardTransmit(slot->pcsc_card, SCARD_PCI_T0, xmit_buf, xmit_len, SCARD_PCI_T1, recv_buf, &recv_len);
+	scard_xmit_ret = SCardTransmit(slot->pcsc_card, SCARD_PCI_T0, xmit_buf, xmit_len, NULL, recv_buf, &recv_len);
 	if (scard_xmit_ret != SCARD_S_SUCCESS) {
 		CACKEY_DEBUG_PRINTF("Failed to send APDU to card (SCardTransmit() = %s/%lx)", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_xmit_ret), (unsigned long) scard_xmit_ret);
 		CACKEY_DEBUG_PRINTF("Marking slot as having been reset");
 
 		slot->transaction_depth = 0;
@@ -1084,11 +1088,11 @@
 		slot->slot_reset = 1;
 
 		if (scard_xmit_ret == SCARD_W_RESET_CARD) {
 			CACKEY_DEBUG_PRINTF("Reset required, please hold...");
 
-			scard_reconn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, SCARD_RESET_CARD, &protocol);
+			scard_reconn_ret = SCardReconnect(slot->pcsc_card, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, SCARD_RESET_CARD, &protocol);
 			if (scard_reconn_ret == SCARD_S_SUCCESS) {
 				/* Re-establish transaction, if it was present */
 				if (slot->transaction_depth > 0) {
 					slot->transaction_depth--;
 					cackey_begin_transaction(slot);
@@ -1095,11 +1099,11 @@
 				}
 
 				CACKEY_DEBUG_PRINTF("Reset successful, retransmitting");
 
 				recv_len = sizeof(recv_buf);
-				scard_xmit_ret = SCardTransmit(slot->pcsc_card, SCARD_PCI_T0, xmit_buf, xmit_len, SCARD_PCI_T0, recv_buf, &recv_len);
+				scard_xmit_ret = SCardTransmit(slot->pcsc_card, SCARD_PCI_T0, xmit_buf, xmit_len, NULL, recv_buf, &recv_len);
 
 				if (scard_xmit_ret != SCARD_S_SUCCESS) {
 					CACKEY_DEBUG_PRINTF("Retransmit failed, returning in failure after disconnecting the card (SCardTransmit = %s/%li)", CACKEY_DEBUG_FUNC_SCARDERR_TO_STR(scard_xmit_ret), (long) scard_xmit_ret);
 
 					SCardDisconnect(slot->pcsc_card, SCARD_RESET_CARD);