diff options
Diffstat (limited to 'security/libbeid/files/patch-pkcs11')
| -rw-r--r-- | security/libbeid/files/patch-pkcs11 | 101 |
1 files changed, 2 insertions, 99 deletions
diff --git a/security/libbeid/files/patch-pkcs11 b/security/libbeid/files/patch-pkcs11 index fcbc952fc638..39e7d7bc2aed 100644 --- a/security/libbeid/files/patch-pkcs11 +++ b/security/libbeid/files/patch-pkcs11 @@ -1,102 +1,5 @@ -Index: pkcs11/src/asn1.c -=================================================================== ---- pkcs11/src/asn1.c (revision 1614) -+++ pkcs11/src/asn1.c (working copy) -@@ -253,7 +253,7 @@ for (; *p_cPath; p_cPath++) - /* check if we are decoding inside a BIT STRING: iNumTag == parent_tag */ - /* first octet of bit string is the number of unused bits at the end of the bitstring */ - /* in CER/DER: unused bits are always zero. And if they aren't zero, we still don't need to know the nr. of unused bits */ -- if ((iNumTag == 0x03) ) -+ if (iNumTag == 0x03) - { - p_cDat++; - iLen--; -Index: pkcs11/src/cal.cpp -=================================================================== ---- pkcs11/src/cal.cpp (revision 1614) -+++ pkcs11/src/cal.cpp (working copy) -@@ -945,7 +945,7 @@ CK_RV cal_get_card_data(CK_SLOT_ID hSlot - std::string szReader; - // char cBuffer[250]; - // unsigned char ucBuffer[250]; -- char* plabel = NULL; -+ char const *plabel = NULL; - CTLVBuffer oTLVBuffer; - P11_SLOT *pSlot = NULL; - CK_ATTRIBUTE ID_DATA[]= BEID_TEMPLATE_ID_DATA; -@@ -1141,8 +1141,8 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot - std::string szReader; - char cBuffer[256]; - // unsigned char ucBuffer[250]; -- char* plabel = NULL; -- char* pobjectID = NULL; -+ char const *plabel = NULL; -+ char const *pobjectID = NULL; - unsigned long ulLen=0; - CTLVBuffer oTLVBuffer; - CTLVBuffer oTLVBufferAddress;//need second buffer object, as memory is only freed when this object is destructed -@@ -1176,7 +1176,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot - pobjectID = BEID_OBJECTID_ID; - ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject, - (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) oFileData.GetBytes(),(CK_ULONG)oFileData.Size(), -- pobjectID, (CK_ULONG)strlen(pobjectID)); -+ (CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(pobjectID)); - if (ret) goto cleanup; - - oTLVBuffer.ParseTLV(oFileData.GetBytes(), oFileData.Size()); -@@ -1190,7 +1190,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot - oTLVBuffer.FillUTF8Data(ID_LABELS[i].tag, cBuffer, &ulLen); - plabel = ID_LABELS[i].name; - ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject, -- (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) cBuffer,ulLen,pobjectID, (CK_ULONG)strlen(pobjectID)); -+ (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) cBuffer,ulLen,(CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(pobjectID)); - if (ret) goto cleanup; - } - if(dataType != CACHED_DATA_TYPE_ALL){ -@@ -1202,7 +1202,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot - pobjectID = BEID_OBJECTID_ADDRESS; - ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject, - (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) oFileData.GetBytes(),(CK_ULONG)oFileData.Size(), -- pobjectID, (CK_ULONG)strlen(pobjectID)); -+ (CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(pobjectID)); - if (ret) goto cleanup; - oTLVBufferAddress.ParseTLV(oFileData.GetBytes(), oFileData.Size()); - nrOfItems = sizeof(ADDRESS_LABELS)/sizeof(BEID_DATA_LABELS_NAME); -@@ -1214,7 +1214,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot - plabel = ADDRESS_LABELS[i].name; - ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject, - (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) cBuffer,ulLen, -- pobjectID, (CK_ULONG)strlen(pobjectID)); -+ (CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(pobjectID)); - if (ret) goto cleanup; - } - if(dataType != CACHED_DATA_TYPE_ALL){ -@@ -1226,7 +1226,7 @@ CK_RV cal_read_ID_files(CK_SLOT_ID hSlot - oFileData = oReader.ReadFile(BEID_FILE_PHOTO); - ret = p11_add_slot_ID_object(pSlot, ID_DATA, sizeof(ID_DATA)/sizeof(CK_ATTRIBUTE), CK_TRUE, CKO_DATA, CK_FALSE, &hObject, - (CK_VOID_PTR)plabel, (CK_ULONG)strlen(plabel),(CK_VOID_PTR) oFileData.GetBytes(),(CK_ULONG)oFileData.Size(), -- pobjectID, (CK_ULONG)strlen(BEID_OBJECTID_PHOTO)); -+ (CK_VOID_PTR)pobjectID, (CK_ULONG)strlen(BEID_OBJECTID_PHOTO)); - if (ret) goto cleanup; - if(dataType != CACHED_DATA_TYPE_ALL){ - break; -Index: pkcs11/src/cal.h -=================================================================== ---- pkcs11/src/cal.h (revision 1614) -+++ pkcs11/src/cal.h (working copy) -@@ -184,7 +184,7 @@ extern "C" { - - typedef struct BEID_DATA_LABELS_NAME { - unsigned char tag; -- char* name; -+ char const * name; - }BEID_DATA_LABELS_NAME; - - #define BEID_LABEL_DATA_FILE "DATA_FILE" -Index: pkcs11/src/log.h -=================================================================== ---- pkcs11/src/log.h (revision 1614) -+++ pkcs11/src/log.h (working copy) +--- cardcomm/pkcs11/src/log.h.orig 2015-06-02 08:02:25 UTC ++++ cardcomm/pkcs11/src/log.h @@ -60,42 +60,42 @@ typedef struct P11_MAP_TYPE static P11_MAP_TYPE const P11_CLASS_TYPES[]= |