diff --git a/crypto/sdf/sdf_lib.c b/crypto/sdf/sdf_lib.c index ded1b4ad..99f70142 100644 --- a/crypto/sdf/sdf_lib.c +++ b/crypto/sdf/sdf_lib.c @@ -1232,12 +1232,12 @@ int SDF_CreateFile( { int ret = SDR_UNKNOWERR; - if (!sdf_method || !sdf_method->CreateFile) { + if (!sdf_method || !sdf_method->CreateFileObject) { SDFerr(SDF_F_SDF_CREATEFILE, SDF_R_NOT_INITIALIZED); return SDR_NOTSUPPORT; } - if ((ret = sdf_method->CreateFile( + if ((ret = sdf_method->CreateFileObject( hSessionHandle, pucFileName, uiNameLen, @@ -1259,12 +1259,12 @@ int SDF_ReadFile( { int ret = SDR_UNKNOWERR; - if (!sdf_method || !sdf_method->ReadFile) { + if (!sdf_method || !sdf_method->ReadFileObject) { SDFerr(SDF_F_SDF_READFILE, SDF_R_NOT_INITIALIZED); return SDR_NOTSUPPORT; } - if ((ret = sdf_method->ReadFile( + if ((ret = sdf_method->ReadFileObject( hSessionHandle, pucFileName, uiNameLen, @@ -1288,12 +1288,12 @@ int SDF_WriteFile( { int ret = SDR_UNKNOWERR; - if (!sdf_method || !sdf_method->WriteFile) { + if (!sdf_method || !sdf_method->WriteFileObject) { SDFerr(SDF_F_SDF_WRITEFILE, SDF_R_NOT_INITIALIZED); return SDR_NOTSUPPORT; } - if ((ret = sdf_method->WriteFile( + if ((ret = sdf_method->WriteFileObject( hSessionHandle, pucFileName, uiNameLen, @@ -1314,12 +1314,12 @@ int SDF_DeleteFile( { int ret = SDR_UNKNOWERR; - if (!sdf_method || !sdf_method->DeleteFile) { + if (!sdf_method || !sdf_method->DeleteFileObject) { SDFerr(SDF_F_SDF_DELETEFILE, SDF_R_NOT_INITIALIZED); return SDR_NOTSUPPORT; } - if ((ret = sdf_method->DeleteFile( + if ((ret = sdf_method->DeleteFileObject( hSessionHandle, pucFileName, uiNameLen)) != SDR_OK) { diff --git a/crypto/sdf/sdf_meth.c b/crypto/sdf/sdf_meth.c index fde132b4..8007e1c8 100644 --- a/crypto/sdf/sdf_meth.c +++ b/crypto/sdf/sdf_meth.c @@ -108,10 +108,10 @@ SDF_METHOD *SDF_METHOD_load_library(const char *so_path) sdf->HashInit = (SDF_HashInit_FuncPtr)DSO_bind_func(dso, "SDF_HashInit"); sdf->HashUpdate = (SDF_HashUpdate_FuncPtr)DSO_bind_func(dso, "SDF_HashUpdate"); sdf->HashFinal = (SDF_HashFinal_FuncPtr)DSO_bind_func(dso, "SDF_HashFinal"); - sdf->CreateFile = (SDF_CreateFile_FuncPtr)DSO_bind_func(dso, "SDF_CreateFile"); - sdf->ReadFile = (SDF_ReadFile_FuncPtr)DSO_bind_func(dso, "SDF_ReadFile"); - sdf->WriteFile = (SDF_WriteFile_FuncPtr)DSO_bind_func(dso, "SDF_WriteFile"); - sdf->DeleteFile = (SDF_DeleteFile_FuncPtr)DSO_bind_func(dso, "SDF_DeleteFile"); + sdf->CreateFileObject = (SDF_CreateFile_FuncPtr)DSO_bind_func(dso, "SDF_CreateFile"); + sdf->ReadFileObject = (SDF_ReadFile_FuncPtr)DSO_bind_func(dso, "SDF_ReadFile"); + sdf->WriteFileObject = (SDF_WriteFile_FuncPtr)DSO_bind_func(dso, "SDF_WriteFile"); + sdf->DeleteFileObject = (SDF_DeleteFile_FuncPtr)DSO_bind_func(dso, "SDF_DeleteFile"); ret = sdf; diff --git a/include/internal/sdf_meth.h b/include/internal/sdf_meth.h index ef10e5e2..4bfe889f 100644 --- a/include/internal/sdf_meth.h +++ b/include/internal/sdf_meth.h @@ -432,10 +432,10 @@ typedef struct sdf_method_st { SDF_HashInit_FuncPtr HashInit; SDF_HashUpdate_FuncPtr HashUpdate; SDF_HashFinal_FuncPtr HashFinal; - SDF_CreateFile_FuncPtr CreateFile; - SDF_ReadFile_FuncPtr ReadFile; - SDF_WriteFile_FuncPtr WriteFile; - SDF_DeleteFile_FuncPtr DeleteFile; + SDF_CreateFile_FuncPtr CreateFileObject; + SDF_ReadFile_FuncPtr ReadFileObject; + SDF_WriteFile_FuncPtr WriteFileObject; + SDF_DeleteFile_FuncPtr DeleteFileObject; } SDF_METHOD; SDF_METHOD *SDF_METHOD_load_library(const char *so_path);