Skip to content

Commit d7e7ff5

Browse files
anhuanhu
committed
Fixes from review by dgarske.
1 parent 3ebc1fc commit d7e7ff5

4 files changed

Lines changed: 49 additions & 48 deletions

File tree

‎src/tpm2_wrap.c‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ WOLFTPM2_DEV *wolfTPM2_New(void)
184184
}
185185

186186
if (wolfTPM2_Init(dev, NULL, NULL) != TPM_RC_SUCCESS) {
187+
XFREE(dev, NULL, DYNAMIC_TYPE_TMP_BUFFER);
187188
return NULL;
188189
}
189190

@@ -199,7 +200,7 @@ int wolfTPM2_Free(WOLFTPM2_DEV *dev)
199200
return TPM_RC_SUCCESS;
200201
}
201202

202-
WOLFTPM2_KEYBLOB* wolfTPM2_GetNewKeyBlob(void)
203+
WOLFTPM2_KEYBLOB* wolfTPM2_NewKeyBlob(void)
203204
{
204205
WOLFTPM2_KEYBLOB* blob = NULL;
205206

@@ -213,15 +214,15 @@ WOLFTPM2_KEYBLOB* wolfTPM2_GetNewKeyBlob(void)
213214
return blob;
214215
}
215216

216-
int wolfTPM2_CleanupKeyBlob(WOLFTPM2_KEYBLOB* blob)
217+
int wolfTPM2_FreeKeyBlob(WOLFTPM2_KEYBLOB* blob)
217218
{
218219
if (blob != NULL) {
219220
XFREE(blob, NULL, DYNAMIC_TYPE_TMP_BUFFER);
220221
}
221222
return TPM_RC_SUCCESS;
222223
}
223224

224-
WOLFTPM_API TPMT_PUBLIC* wolfTPM2_GetNewPublicTemplate(void)
225+
TPMT_PUBLIC* wolfTPM2_NewPublicTemplate(void)
225226
{
226227
TPMT_PUBLIC* template = NULL;
227228

@@ -235,15 +236,15 @@ WOLFTPM_API TPMT_PUBLIC* wolfTPM2_GetNewPublicTemplate(void)
235236
return template;
236237
}
237238

238-
WOLFTPM_API int wolfTPM2_CleanupPublicTemplate(TPMT_PUBLIC* template)
239+
int wolfTPM2_FreePublicTemplate(TPMT_PUBLIC* template)
239240
{
240241
if (template != NULL) {
241242
XFREE(template, NULL, DYNAMIC_TYPE_TMP_BUFFER);
242243
}
243244
return TPM_RC_SUCCESS;
244245
}
245246

246-
WOLFTPM_API WOLFTPM2_KEY* wolfTPM2_GetNewKey(void)
247+
WOLFTPM2_KEY* wolfTPM2_NewKey(void)
247248
{
248249
WOLFTPM2_KEY* key = NULL;
249250

@@ -257,15 +258,15 @@ WOLFTPM_API WOLFTPM2_KEY* wolfTPM2_GetNewKey(void)
257258
return key;
258259
}
259260

260-
WOLFTPM_API int wolfTPM2_CleanupKey(WOLFTPM2_KEY* key)
261+
int wolfTPM2_FreeKey(WOLFTPM2_KEY* key)
261262
{
262263
if (key != NULL) {
263264
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
264265
}
265266
return TPM_RC_SUCCESS;
266267
}
267268

268-
WOLFTPM2_SESSION* wolfTPM2_GetNewSession(void)
269+
WOLFTPM2_SESSION* wolfTPM2_NewSession(void)
269270
{
270271
WOLFTPM2_SESSION* session = NULL;
271272

@@ -279,7 +280,7 @@ WOLFTPM2_SESSION* wolfTPM2_GetNewSession(void)
279280
return session;
280281
}
281282

282-
int wolfTPM2_CleanupSession(WOLFTPM2_SESSION* session)
283+
int wolfTPM2_FreeSession(WOLFTPM2_SESSION* session)
283284
{
284285
if (session != NULL) {
285286
XFREE(session, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@@ -316,7 +317,7 @@ int wolfTPM2_GetKeyBlobAsBuffer(byte *buffer, word32 bufferSz,
316317
}
317318

318319
if (pubAreaSize != (key->pub.size + (int)sizeof(key->pub.size))) {
319-
#ifdef WOLFTPM_DEBUG_VERBOSE
320+
#ifdef DEBUG_WOLFTPM
320321
printf("Sanity check for publicArea size failed\n");
321322
#endif
322323
return BUFFER_E;
@@ -368,7 +369,7 @@ int wolfTPM2_SetKeyBlobFromBuffer(WOLFTPM2_KEYBLOB* key, byte *buffer,
368369
#endif
369370

370371
if (bufferSz < done_reading + sizeof(key->pub.size)) {
371-
#ifdef WOLFTPM_DEBUG_VERBOSE
372+
#ifdef DEBUG_WOLFTPM
372373
printf("Buffer size check failed (%d)\n", bufferSz);
373374
#endif
374375
return BUFFER_E;
@@ -379,7 +380,7 @@ int wolfTPM2_SetKeyBlobFromBuffer(WOLFTPM2_KEYBLOB* key, byte *buffer,
379380
done_reading += sizeof(key->pub.size);
380381

381382
if (bufferSz < done_reading + sizeof(UINT16) + key->pub.size) {
382-
#ifdef WOLFTPM_DEBUG_VERBOSE
383+
#ifdef DEBUG_WOLFTPM
383384
printf("Buffer size check failed (%d)\n", bufferSz);
384385
#endif
385386
return BUFFER_E;
@@ -397,7 +398,7 @@ int wolfTPM2_SetKeyBlobFromBuffer(WOLFTPM2_KEYBLOB* key, byte *buffer,
397398
}
398399

399400
if (bufferSz < done_reading + sizeof(key->priv.size)) {
400-
#ifdef WOLFTPM_DEBUG_VERBOSE
401+
#ifdef DEBUG_WOLFTPM
401402
printf("Buffer size check failed (%d)\n", bufferSz);
402403
#endif
403404
return BUFFER_E;
@@ -408,7 +409,7 @@ int wolfTPM2_SetKeyBlobFromBuffer(WOLFTPM2_KEYBLOB* key, byte *buffer,
408409
done_reading += sizeof(key->priv.size);
409410

410411
if (bufferSz < done_reading + key->priv.size) {
411-
#ifdef WOLFTPM_DEBUG_VERBOSE
412+
#ifdef DEBUG_WOLFTPM
412413
printf("Buffer size check failed (%d)\n", bufferSz);
413414
#endif
414415
return BUFFER_E;

‎wolftpm/tpm2_wrap.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2351,14 +2351,14 @@ WOLFTPM_API int wolfTPM2_ClearCryptoDevCb(WOLFTPM2_DEV* dev, int devId);
23512351
#ifndef WOLFTPM2_NO_HEAP
23522352
WOLFTPM_API WOLFTPM2_DEV *wolfTPM2_New(void);
23532353
WOLFTPM_API int wolfTPM2_Free(WOLFTPM2_DEV *dev);
2354-
WOLFTPM_API WOLFTPM2_KEYBLOB* wolfTPM2_GetNewKeyBlob(void);
2355-
WOLFTPM_API int wolfTPM2_CleanupKeyBlob(WOLFTPM2_KEYBLOB* blob);
2356-
WOLFTPM_API TPMT_PUBLIC* wolfTPM2_GetNewPublicTemplate(void);
2357-
WOLFTPM_API int wolfTPM2_CleanupPublicTemplate(TPMT_PUBLIC* template);
2358-
WOLFTPM_API WOLFTPM2_KEY* wolfTPM2_GetNewKey(void);
2359-
WOLFTPM_API int wolfTPM2_CleanupKey(WOLFTPM2_KEY* key);
2360-
WOLFTPM_API WOLFTPM2_SESSION* wolfTPM2_GetNewSession(void);
2361-
WOLFTPM_API int wolfTPM2_CleanupSession(WOLFTPM2_SESSION* session);
2354+
WOLFTPM_API WOLFTPM2_KEYBLOB* wolfTPM2_NewKeyBlob(void);
2355+
WOLFTPM_API int wolfTPM2_FreeKeyBlob(WOLFTPM2_KEYBLOB* blob);
2356+
WOLFTPM_API TPMT_PUBLIC* wolfTPM2_NewPublicTemplate(void);
2357+
WOLFTPM_API int wolfTPM2_FreePublicTemplate(TPMT_PUBLIC* template);
2358+
WOLFTPM_API WOLFTPM2_KEY* wolfTPM2_NewKey(void);
2359+
WOLFTPM_API int wolfTPM2_FreeKey(WOLFTPM2_KEY* key);
2360+
WOLFTPM_API WOLFTPM2_SESSION* wolfTPM2_NewSession(void);
2361+
WOLFTPM_API int wolfTPM2_FreeSession(WOLFTPM2_SESSION* session);
23622362
#endif
23632363

23642364
WOLFTPM_API int wolfTPM2_OpenExistingDev(WOLFTPM2_DEV* dev);

‎wrapper/CSharp/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
This directory contains the CSharp wrapper for the TPM 2.0 API wrapper API.
44

55

6-
Once you have created the simulator, you can should build wolfssl as described
7-
in the README.md in the root of this repo. Then you can build wolfTPM:
6+
Once you have created the simulator, you can build wolfssl as described in the
7+
README.md in the root of this repo. Then you can build wolfTPM:
88

99
## Windows
1010

‎wrapper/CSharp/wolfTPM.cs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ public class KeyBlob
7676
{
7777
const string DLLNAME = "wolftpm";
7878

79-
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_GetNewKeyBlob")]
80-
private static extern IntPtr wolfTPM2_GetNewKeyBlob();
79+
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_NewKeyBlob")]
80+
private static extern IntPtr wolfTPM2_NewKeyBlob();
8181

82-
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_CleanupKeyBlob")]
83-
private static extern int wolfTPM2_CleanupKeyBlob(IntPtr blob);
82+
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_FreeKeyBlob")]
83+
private static extern int wolfTPM2_FreeKeyBlob(IntPtr blob);
8484

8585
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_GetKeyBlobAsBuffer")]
8686
private static extern int wolfTPM2_GetKeyBlobAsBuffer(byte[] buffer,
@@ -93,15 +93,15 @@ private static extern int wolfTPM2_SetKeyBlobFromBuffer(IntPtr key,
9393

9494
public KeyBlob()
9595
{
96-
keyblob = wolfTPM2_GetNewKeyBlob();
96+
keyblob = wolfTPM2_NewKeyBlob();
9797
}
9898

9999
~KeyBlob()
100100
{
101101
if (keyblob != IntPtr.Zero)
102102
{
103103
// TODO: check return value?
104-
wolfTPM2_CleanupKeyBlob(keyblob);
104+
wolfTPM2_FreeKeyBlob(keyblob);
105105
}
106106
}
107107

@@ -120,11 +120,11 @@ public class Key
120120
{
121121
const string DLLNAME = "wolftpm";
122122

123-
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_GetNewKey")]
124-
private static extern IntPtr wolfTPM2_GetNewKey();
123+
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_NewKey")]
124+
private static extern IntPtr wolfTPM2_NewKey();
125125

126-
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_CleanupKey")]
127-
private static extern int wolfTPM2_CleanupKey(IntPtr key);
126+
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_FreeKey")]
127+
private static extern int wolfTPM2_FreeKey(IntPtr key);
128128

129129
/* ================================================================== */
130130
/* Native Getters and Setters */
@@ -144,15 +144,15 @@ private static extern int wolfTPM2_SetKeyAuthPassword(
144144

145145
public Key()
146146
{
147-
key = wolfTPM2_GetNewKey();
147+
key = wolfTPM2_NewKey();
148148
}
149149

150150
~Key()
151151
{
152152
if (key != IntPtr.Zero)
153153
{
154154
// TODO: check return value
155-
wolfTPM2_CleanupKey(key);
155+
wolfTPM2_FreeKey(key);
156156
}
157157
}
158158

@@ -174,21 +174,21 @@ public class Template
174174
{
175175
const string DLLNAME = "wolftpm";
176176

177-
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_GetNewPublicTemplate")]
178-
private static extern IntPtr wolfTPM2_GetNewPublicTemplate();
177+
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_NewPublicTemplate")]
178+
private static extern IntPtr wolfTPM2_NewPublicTemplate();
179179

180-
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_CleanupPublicTemplate")]
181-
private static extern int wolfTPM2_CleanupPublicTemplate(IntPtr template);
180+
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_FreePublicTemplate")]
181+
private static extern int wolfTPM2_FreePublicTemplate(IntPtr template);
182182

183183
internal IntPtr template;
184184
public Template()
185185
{
186-
template = wolfTPM2_GetNewPublicTemplate();
186+
template = wolfTPM2_NewPublicTemplate();
187187
}
188188

189189
~Template()
190190
{
191-
wolfTPM2_CleanupPublicTemplate(template);
191+
wolfTPM2_FreePublicTemplate(template);
192192
}
193193

194194
/* non-device functions: template and auth */
@@ -225,26 +225,26 @@ public class Session
225225
{
226226
const string DLLNAME = "wolftpm";
227227

228-
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_GetNewSession")]
229-
private static extern IntPtr wolfTPM2_GetNewSession();
228+
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_NewSession")]
229+
private static extern IntPtr wolfTPM2_NewSession();
230230

231-
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_CleanupSession")]
232-
private static extern int wolfTPM2_CleanupSession(IntPtr session);
231+
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_FreeSession")]
232+
private static extern int wolfTPM2_FreeSession(IntPtr session);
233233

234234

235235
internal IntPtr session;
236236

237237
public Session()
238238
{
239-
session = wolfTPM2_GetNewSession();
239+
session = wolfTPM2_NewSession();
240240
}
241241

242242
~Session()
243243
{
244244
if (session != IntPtr.Zero)
245245
{
246246
// TODO: check return value
247-
wolfTPM2_CleanupSession(session);
247+
wolfTPM2_FreeSession(session);
248248
}
249249
}
250250

@@ -278,7 +278,7 @@ public Device()
278278
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_New")]
279279
private static extern IntPtr wolfTPM2_New();
280280

281-
/* WOLFTPM_API int wolfTPM2_SimpleCleanup(WOLFTPM2_DEV *dev); */
281+
/* WOLFTPM_API int wolfTPM2_Free(WOLFTPM2_DEV *dev); */
282282
[DllImport(DLLNAME, EntryPoint = "wolfTPM2_Free")]
283283
private static extern int wolfTPM2_Free(IntPtr dev);
284284

0 commit comments

Comments
 (0)