Overview
| Comment: | Further failure to free on error repaired and start of AFL testing code added. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
8299a1c4f794038ebd130b9ccd5062d4 |
| User & Date: | rkeene on 2015-07-24 04:11:09 |
| Original Comment: | Further failure to free on error repaired |
| Other Links: | manifest | tags |
Context
|
2015-07-24
| ||
| 15:10 | Fixed issue with NULL tags found with AFL fuzzing check-in: 74d7607e3c user: rkeene tags: trunk | |
| 04:11 | Further failure to free on error repaired and start of AFL testing code added. check-in: 8299a1c4f7 user: rkeene tags: trunk | |
| 04:07 | Added more fixes for memory leaks or use of uninitialized memory check-in: 846e77f0f5 user: rkeene tags: trunk | |
Changes
Modified cackey.c from [aa058371f0] to [a17e1982da].
| ︙ | ︙ | |||
2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 |
*count = outidx;
if (certs_resizable) {
if (*count != 0) {
certs = realloc(certs, sizeof(*certs) * (*count));
} else {
certs = NULL;
}
}
slot->cached_certs = cackey_copy_certs(NULL, certs, *count);
slot->cached_certs_count = *count;
| > > | 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 |
*count = outidx;
if (certs_resizable) {
if (*count != 0) {
certs = realloc(certs, sizeof(*certs) * (*count));
} else {
free(certs);
certs = NULL;
}
}
slot->cached_certs = cackey_copy_certs(NULL, certs, *count);
slot->cached_certs_count = *count;
|
| ︙ | ︙ |
Modified test.c from [47338c5b52] to [eb71775c47].
|
| < < > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
#include <sys/types.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#ifndef CACKEY_TEST_AFL
#include "mypkcs11.h"
static char *pkcs11_attribute_to_name(CK_ATTRIBUTE_TYPE attrib) {
static char retbuf[1024];
switch (attrib) {
case 0x00000000: return "CKA_CLASS";
case 0x00000001: return "CKA_TOKEN";
|
| ︙ | ︙ | |||
616 617 618 619 620 621 622 |
if (privateKeyObjects_root) {
free(privateKeyObjects_root);
}
return(0);
}
| | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 |
if (privateKeyObjects_root) {
free(privateKeyObjects_root);
}
return(0);
}
int main(int argc, char **argv) {
int retval = 0, ck_retval;
printf("Testing libcackey...\n");
ck_retval = main_pkcs11();
if (ck_retval != 0) {
retval = ck_retval;
}
printf("Testing libcackey... DONE. Status = %i\n", ck_retval);
return(retval);
/* UNREACHED: This is just to supress a warning about arguments to main we do not use. */
argc = argc;
argv = argv;
}
#else /* CACKEY_TEST_AFL */
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
/* Include the CACKey source */
#include "cackey.c"
/* Fake a smartcard */
static int scard_inTransaction = 0;
static LONG scard_protocol;
PCSC_API LONG SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext) {
CACKEY_DEBUG_PRINTF("Called");
*phContext = 42;
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardIsValidContext(SCARDCONTEXT hContext) {
CACKEY_DEBUG_PRINTF("Called");
if (hContext != 42) {
return(SCARD_E_INVALID_HANDLE);
}
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardListReaders(SCARDCONTEXT hContext, LPCSTR mszGroups, LPSTR mszReaders, LPDWORD pcchReaders) {
static char *readers = "READER0";
CACKEY_DEBUG_PRINTF("Called");
if (hContext != 42) {
return(SCARD_E_INVALID_HANDLE);
}
*pcchReaders = strlen(readers) + 1;
if (mszReaders == NULL) {
return(SCARD_S_SUCCESS);
}
memcpy(mszReaders, readers, *pcchReaders);
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardBeginTransaction(SCARDHANDLE hCard) {
CACKEY_DEBUG_PRINTF("Called");
if (hCard != 99) {
return(SCARD_E_INVALID_HANDLE);
}
if (scard_inTransaction) {
return(SCARD_E_SHARING_VIOLATION);
}
scard_inTransaction = 1;
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition) {
CACKEY_DEBUG_PRINTF("Called");
if (hCard != 99) {
return(SCARD_E_INVALID_HANDLE);
}
scard_inTransaction = 0;
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardStatus(SCARDHANDLE hCard, LPSTR mszReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) {
LONG scardlistreaders_ret;
CACKEY_DEBUG_PRINTF("Called");
if (hCard != 99) {
return(SCARD_E_INVALID_HANDLE);
}
*pdwState = 0;
scardlistreaders_ret = SCardListReaders(42, NULL, mszReaderName, pcchReaderLen);
if (scardlistreaders_ret != SCARD_S_SUCCESS) {
return(scardlistreaders_ret);
}
*pdwProtocol = scard_protocol;
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardConnect(SCARDCONTEXT hContext, LPCSTR szReader, DWORD dwShareMode, DWORD dwPreferredProtocols, LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) {
CACKEY_DEBUG_PRINTF("Called");
if (hContext != 42) {
return(SCARD_E_INVALID_HANDLE);
}
if ((dwPreferredProtocols & SCARD_PROTOCOL_T0) == SCARD_PROTOCOL_T0) {
*pdwActiveProtocol = SCARD_PROTOCOL_T0;
} else {
*pdwActiveProtocol = SCARD_PROTOCOL_T1;
}
scard_protocol = *pdwActiveProtocol;
*phCard = 99;
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition) {
CACKEY_DEBUG_PRINTF("Called");
if (hCard != 99) {
return(SCARD_E_INVALID_HANDLE);
}
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode, DWORD dwPreferredProtocols, DWORD dwInitialization, LPDWORD pdwActiveProtocol) {
CACKEY_DEBUG_PRINTF("Called");
if (hCard != 99) {
return(SCARD_E_INVALID_HANDLE);
}
return(SCardConnect(42, NULL, dwShareMode, dwPreferredProtocols, NULL, pdwActiveProtocol));
}
PCSC_API LONG SCardReleaseContext(SCARDCONTEXT hContext) {
CACKEY_DEBUG_PRINTF("Called");
if (hContext != 42) {
return(SCARD_E_INVALID_HANDLE);
}
return(SCARD_S_SUCCESS);
}
PCSC_API LONG SCardTransmit(SCARDHANDLE hCard, const SCARD_IO_REQUEST *pioSendPci, LPCBYTE pbSendBuffer, DWORD cbSendLength, SCARD_IO_REQUEST *pioRecvPci, LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength) {
CACKEY_DEBUG_PRINTF("Called");
if (hCard != 99) {
return(SCARD_E_INVALID_HANDLE);
}
pbRecvBuffer[0] = 0x90;
pbRecvBuffer[1] = 0x00;
*pcbRecvLength = 2;
return(SCARD_S_SUCCESS);
}
/* American Fuzzy Lop testing program */
int main(int argc, char **argv) {
CK_FUNCTION_LIST_PTR pFunctionList;
CK_RV (*C_CloseSession)(CK_SESSION_HANDLE hSession) = NULL;
CK_RV (*C_Finalize)(CK_VOID_PTR pReserved) = NULL;
CK_RV (*C_FindObjects)(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR phObject, CK_ULONG ulMaxObjectCount, CK_ULONG_PTR pulObjectCount) = NULL;
CK_RV (*C_FindObjectsFinal)(CK_SESSION_HANDLE hSession) = NULL;
CK_RV (*C_FindObjectsInit)(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount) = NULL;
CK_RV (*C_GetAttributeValue)(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount) = NULL;
CK_RV (*C_GetSlotList)(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK_ULONG_PTR pulCount) = NULL;
CK_RV (*C_GetTokenInfo)(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) = NULL;
CK_RV (*C_Initialize)(CK_VOID_PTR pInitArgs) = NULL;
CK_RV (*C_Login)(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_UTF8CHAR_PTR pPin, CK_ULONG ulPinLen) = NULL;
CK_RV (*C_OpenSession)(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApplication, CK_NOTIFY notify, CK_SESSION_HANDLE_PTR phSession) = NULL;
CK_RV (*C_Sign)(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, CK_BYTE_PTR pSignature, CK_ULONG_PTR pulSignatureLen) = NULL;
CK_RV (*C_SignInit)(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_OBJECT_HANDLE hKey) = NULL;
CK_C_INITIALIZE_ARGS initargs;
CK_ULONG numSlots;
CK_SLOT_ID_PTR slots = NULL;
CK_TOKEN_INFO tokenInfo;
CK_SESSION_HANDLE hSession;
CK_OBJECT_HANDLE hObject, *privateKeyObjects_root = NULL, *privateKeyObjects, *currPrivKey;
CK_ULONG ulObjectCount;
CK_ATTRIBUTE template[] = {
{CKA_CLASS, NULL, 0},
{CKA_TOKEN, NULL, 0},
{CKA_LABEL, NULL, 0},
{CKA_PRIVATE, NULL, 0},
{CKA_ID, NULL, 0},
{CKA_SERIAL_NUMBER, NULL, 0},
{CKA_SUBJECT, NULL, 0},
{CKA_ISSUER, NULL, 0},
{CKA_CERTIFICATE_TYPE, NULL, 0},
{CKA_KEY_TYPE, NULL, 0},
{CKA_SIGN, NULL, 0},
{CKA_VALUE, NULL, 0},
{CKA_CERT_MD5_HASH, NULL, 0},
{CKA_CERT_SHA1_HASH, NULL, 0},
{CKA_TRUSTED, NULL, 0},
{CKA_TRUST_CLIENT_AUTH, NULL, 0},
{CKA_TRUST_CODE_SIGNING, NULL, 0},
{CKA_TRUST_CRL_SIGN, NULL, 0},
{CKA_TRUST_DATA_ENCIPHERMENT, NULL, 0},
{CKA_TRUST_DIGITAL_SIGNATURE, NULL, 0},
{CKA_TRUST_EMAIL_PROTECTION, NULL, 0},
{CKA_TRUST_KEY_AGREEMENT, NULL, 0},
{CKA_TRUST_KEY_CERT_SIGN, NULL, 0},
{CKA_TRUST_KEY_ENCIPHERMENT, NULL, 0},
{CKA_TRUST_NON_REPUDIATION, NULL, 0},
{CKA_TRUST_SERVER_AUTH, NULL, 0}
}, *curr_attr;
CK_ULONG curr_attr_idx;
CK_ULONG byte_idx;
CK_OBJECT_CLASS objectClass;
CK_BYTE signature[1024];
CK_ULONG signature_len;
CK_MECHANISM mechanism = {CKM_RSA_PKCS, NULL, 0};
CK_RV chk_rv;
ssize_t read_ret;
char data[8192], *fileName = NULL;
unsigned long data_len;
int fd;
int i;
int initialized = 0;
int retval = 1;
fileName = argv[1];
if (fileName == NULL) {
goto cleanup;
}
fd = open(fileName, O_RDONLY);
if (fd < 0) {
goto cleanup;
}
read_ret = read(fd, data, sizeof(data));
if (read_ret < 0) {
goto cleanup;
}
data_len = read_ret;
close(fd);
chk_rv = C_GetFunctionList(&pFunctionList);
if (chk_rv != CKR_OK) {
printf("C_GetFunctionList() failed.");
goto cleanup;
}
C_CloseSession = pFunctionList->C_CloseSession;
C_Finalize = pFunctionList->C_Finalize;
C_FindObjects = pFunctionList->C_FindObjects;
C_FindObjectsFinal = pFunctionList->C_FindObjectsFinal;
C_FindObjectsInit = pFunctionList->C_FindObjectsInit;
C_GetAttributeValue = pFunctionList->C_GetAttributeValue;
C_GetSlotList = pFunctionList->C_GetSlotList;
C_GetTokenInfo = pFunctionList->C_GetTokenInfo;
C_Initialize = pFunctionList->C_Initialize;
C_Login = pFunctionList->C_Login;
C_OpenSession = pFunctionList->C_OpenSession;
C_Sign = pFunctionList->C_Sign;
C_SignInit = pFunctionList->C_SignInit;
privateKeyObjects = malloc(sizeof(*privateKeyObjects) * 1024);
privateKeyObjects_root = privateKeyObjects;
for (i = 0; i < 1024; i++) {
privateKeyObjects[i] = CK_INVALID_HANDLE;
}
initargs.CreateMutex = NULL;
initargs.DestroyMutex = NULL;
initargs.LockMutex = NULL;
initargs.UnlockMutex = NULL;
initargs.flags = CKF_OS_LOCKING_OK;
initargs.pReserved = NULL;
chk_rv = C_Initialize(&initargs);
if (chk_rv != CKR_OK) {
initargs.CreateMutex = NULL;
initargs.DestroyMutex = NULL;
initargs.LockMutex = NULL;
initargs.UnlockMutex = NULL;
initargs.flags = 0;
initargs.pReserved = NULL;
chk_rv = C_Initialize(&initargs);
if (chk_rv != CKR_OK) {
printf("C_Initialize() failed.");
goto cleanup;
}
}
initialized = 1;
chk_rv = C_GetSlotList(FALSE, NULL, &numSlots);
if (chk_rv != CKR_OK) {
goto cleanup;
}
if (numSlots == 0) {
goto cleanup;
}
slots = malloc(sizeof(*slots) * numSlots);
if (slots == NULL) {
goto cleanup;
}
chk_rv = C_GetSlotList(FALSE, slots, &numSlots);
if (chk_rv != CKR_OK) {
goto cleanup;
}
chk_rv = C_OpenSession(slots[0], CKF_SERIAL_SESSION, NULL, NULL, &hSession);
if (chk_rv != CKR_OK) {
goto cleanup;
}
chk_rv = C_GetTokenInfo(slots[0], &tokenInfo);
if (chk_rv != CKR_OK) {
goto cleanup;
}
if ((tokenInfo.flags & CKF_LOGIN_REQUIRED) == CKF_LOGIN_REQUIRED && (tokenInfo.flags & CKF_PROTECTED_AUTHENTICATION_PATH) == 0) {
printf("Unable to login to card.\n");
goto cleanup;
}
chk_rv = C_Login(hSession, CKU_USER, NULL, 0);
if (chk_rv != CKR_OK) {
printf("Login to device failed.\n");
goto cleanup;
}
chk_rv = C_FindObjectsInit(hSession, NULL, 0);
if (chk_rv != CKR_OK) {
goto cleanup;
}
while (1) {
chk_rv = C_FindObjects(hSession, &hObject, 1, &ulObjectCount);
if (chk_rv != CKR_OK) {
printf("FindObjects() failed.\n");
break;
}
if (ulObjectCount == 0) {
break;
}
if (ulObjectCount != 1) {
printf("FindObjects() returned a weird number of objects. Asked for 1, got %lu.\n", ulObjectCount);
break;
}
for (curr_attr_idx = 0; curr_attr_idx < (sizeof(template) / sizeof(template[0])); curr_attr_idx++) {
curr_attr = &template[curr_attr_idx];
if (curr_attr->pValue) {
free(curr_attr->pValue);
}
curr_attr->pValue = NULL;
}
chk_rv = C_GetAttributeValue(hSession, hObject, &template[0], sizeof(template) / sizeof(template[0]));
if (chk_rv == CKR_ATTRIBUTE_TYPE_INVALID || chk_rv == CKR_ATTRIBUTE_SENSITIVE || chk_rv == CKR_BUFFER_TOO_SMALL) {
chk_rv = CKR_OK;
}
if (chk_rv != CKR_OK) {
continue;
}
for (curr_attr_idx = 0; curr_attr_idx < (sizeof(template) / sizeof(template[0])); curr_attr_idx++) {
curr_attr = &template[curr_attr_idx];
if (((CK_LONG) curr_attr->ulValueLen) != ((CK_LONG) -1)) {
curr_attr->pValue = malloc(curr_attr->ulValueLen);
}
}
chk_rv = C_GetAttributeValue(hSession, hObject, &template[0], sizeof(template) / sizeof(template[0]));
if (chk_rv == CKR_OK || chk_rv == CKR_ATTRIBUTE_SENSITIVE || chk_rv == CKR_ATTRIBUTE_TYPE_INVALID || chk_rv == CKR_BUFFER_TOO_SMALL) {
for (curr_attr_idx = 0; curr_attr_idx < (sizeof(template) / sizeof(template[0])); curr_attr_idx++) {
curr_attr = &template[curr_attr_idx];
if (curr_attr->pValue) {
switch (curr_attr->type) {
case CKA_CLASS:
objectClass = *((CK_OBJECT_CLASS *) curr_attr->pValue);
if (objectClass == CKO_PRIVATE_KEY) {
*privateKeyObjects = hObject;
privateKeyObjects++;
}
}
} else {
free(curr_attr->pValue);
curr_attr->pValue = NULL;
}
}
} else {
printf("GetAttributeValue(hObject=%lu)/1 failed (rv = %lu).\n", (unsigned long) hObject, (unsigned long) chk_rv);
}
}
chk_rv = C_FindObjectsFinal(hSession);
if (chk_rv != CKR_OK) {
printf("FindObjectsFinal() failed.\n");
}
for (currPrivKey = privateKeyObjects_root; *currPrivKey != CK_INVALID_HANDLE; currPrivKey++) {
chk_rv = C_SignInit(hSession, &mechanism, *currPrivKey);
if (chk_rv == CKR_OK) {
signature_len = sizeof(signature);
chk_rv = C_Sign(hSession, (CK_BYTE_PTR) data, data_len, (CK_BYTE_PTR) &signature, &signature_len);
if (chk_rv == CKR_OK) {
printf("[%04lu/%02lx] Signature: ", (unsigned long) *currPrivKey, (unsigned long) mechanism.mechanism);
for (byte_idx = 0; byte_idx < signature_len; byte_idx++) {
printf("%02x ", (unsigned int) signature[byte_idx]);
}
printf("\n");
} else {
printf("Sign() failed.\n");
}
} else {
printf("SignInit() failed.\n");
}
}
chk_rv = C_CloseSession(hSession);
if (chk_rv != CKR_OK) {
printf("CloseSession failed.\n");
}
retval = 0;
cleanup:
if (initialized) {
C_Finalize(NULL);
}
if (slots) {
free(slots);
}
if (privateKeyObjects_root) {
free(privateKeyObjects_root);
}
return(retval);
}
#endif
|