From 70ecc7a438ebc9a47a7fbeaf45ecedd9b23615fa Mon Sep 17 00:00:00 2001
From: Zhi Guan <guan@pku.edu.cn>
Date: Sat, 13 May 2017 23:15:18 +0800
Subject: [PATCH] update SKF meth

---
 crypto/skf/skf_lib.c        | 16 ++++++++--------
 include/internal/skf_meth.h |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crypto/skf/skf_lib.c b/crypto/skf/skf_lib.c
index 0a298472..d4822a5d 100644
--- a/crypto/skf/skf_lib.c
+++ b/crypto/skf/skf_lib.c
@@ -393,8 +393,8 @@ ULONG DEVAPI SKF_CreateFile(
 	ULONG ulReadRights,
 	ULONG ulWriteRights)
 {
-	if (skf_method->CreateFile) {
-		return skf_method->CreateFile(
+	if (skf_method->CreateFileObject) {
+		return skf_method->CreateFileObject(
 			hApplication,
 			szFileName,
 			ulFileSize,
@@ -408,8 +408,8 @@ ULONG DEVAPI SKF_DeleteFile(
 	HAPPLICATION hApplication,
 	LPSTR szFileName)
 {
-	if (skf_method->DeleteFile) {
-		return skf_method->DeleteFile(
+	if (skf_method->DeleteFileObject) {
+		return skf_method->DeleteFileObject(
 			hApplication,
 			szFileName);
 	}
@@ -452,8 +452,8 @@ ULONG DEVAPI SKF_ReadFile(
 	BYTE *pbOutData,
 	ULONG *pulOutLen)
 {
-	if (skf_method->ReadFile) {
-		return skf_method->ReadFile(
+	if (skf_method->ReadFileObject) {
+		return skf_method->ReadFileObject(
 			hApplication,
 			szFileName,
 			ulOffset,
@@ -471,8 +471,8 @@ ULONG DEVAPI SKF_WriteFile(
 	BYTE *pbData,
 	ULONG ulSize)
 {
-	if (skf_method->WriteFile) {
-		return skf_method->WriteFile(
+	if (skf_method->WriteFileObject) {
+		return skf_method->WriteFileObject(
 			hApplication,
 			szFileName,
 			ulOffset,
diff --git a/include/internal/skf_meth.h b/include/internal/skf_meth.h
index 636650ce..8bf9029b 100644
--- a/include/internal/skf_meth.h
+++ b/include/internal/skf_meth.h
@@ -532,12 +532,12 @@ typedef struct skf_method_st {
 	SKF_DeleteApplication_FuncPtr DeleteApplication;
 	SKF_OpenApplication_FuncPtr OpenApplication;
 	SKF_CloseApplication_FuncPtr CloseApplication;
-	SKF_CreateFile_FuncPtr CreateFile;
-	SKF_DeleteFile_FuncPtr DeleteFile;
+	SKF_CreateFile_FuncPtr CreateFileObject;
+	SKF_DeleteFile_FuncPtr DeleteFileObject;
 	SKF_EnumFiles_FuncPtr EnumFiles;
 	SKF_GetFileInfo_FuncPtr GetFileInfo;
-	SKF_ReadFile_FuncPtr ReadFile;
-	SKF_WriteFile_FuncPtr WriteFile;
+	SKF_ReadFile_FuncPtr ReadFileObject;
+	SKF_WriteFile_FuncPtr WriteFileObject;
 	SKF_CreateContainer_FuncPtr CreateContainer;
 	SKF_DeleteContainer_FuncPtr DeleteContainer;
 	SKF_EnumContainer_FuncPtr EnumContainer;