Upgrade to tpm-emulator version 0.7.

tpm/tpm_crypto.c

-/* Software-Based Trusted Platform Module (TPM) Emulator for Linux
- * Copyright (C) 2004 Mario Strasser <mast@gmx.net>,
- *                    Swiss Federal Institute of Technology (ETH) Zurich
+/* Software-based Trusted Platform Module (TPM) Emulator
+ * Copyright (C) 2004-2010 Mario Strasser <mast@gmx.net>
  *
  * This module is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
  *
  * This module is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * $Id$
+ * $Id: tpm_crypto.c 368 2010-02-15 09:26:37Z mast $
  */
 
 #include "tpm_emulator.h"
 #include "tpm_commands.h"
 #include "tpm_data.h"
 #include "tpm_handles.h"
 #include "crypto/sha1.h"
 #include "crypto/hmac.h"
 #include "crypto/rc4.h"
 #include "tpm_marshalling.h"
@@ skipping 168 matching lines @@
     if (res != TPM_SUCCESS) return res;
   }
   if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY) 
     return TPM_INVALID_KEYUSAGE;
   /* sign data */
   return tpm_sign(key, auth1, FALSE, areaToSign, areaToSignSize, sig, sigSize);
 }
 
 void tpm_get_random_bytes(void *buf, size_t nbytes)
 {
-#ifdef TPM_USE_INTERNAL_PRNG
-  tpm_rc4_ctx_t ctx;
-  tpm_rc4_init(&ctx, tpmData.permanent.data.rngState,
-    sizeof(tpmData.permanent.data.rngState));
-  tpm_rc4_crypt(&ctx, buf, buf, nbytes);
-  tpm_rc4_crypt(&ctx, tpmData.permanent.data.rngState,
-    tpmData.permanent.data.rngState, sizeof(tpmData.permanent.data.rngState));
-#else
-  tpm_get_extern_random_bytes(buf, nbytes);
-#endif
+  if (tpmConf & TPM_CONF_USE_INTERNAL_PRNG) {
+    tpm_rc4_ctx_t ctx;
+    tpm_rc4_init(&ctx, tpmData.permanent.data.rngState,
+      sizeof(tpmData.permanent.data.rngState));
+    tpm_rc4_crypt(&ctx, buf, buf, nbytes);
+    tpm_rc4_crypt(&ctx, tpmData.permanent.data.rngState,
+      tpmData.permanent.data.rngState, sizeof(tpmData.permanent.data.rngState));
+  } else {
+    tpm_get_extern_random_bytes(buf, nbytes);
+  }
 }
 
 TPM_RESULT TPM_GetRandom(UINT32 bytesRequested, UINT32 *randomBytesSize, 
                          BYTE **randomBytes)
 {
   info("TPM_GetRandom()");
   *randomBytesSize = (bytesRequested < 2048) ? bytesRequested : 2048;
   *randomBytes = tpm_malloc(*randomBytesSize);
   if (*randomBytes == NULL) return TPM_SIZE;
   tpm_get_random_bytes(*randomBytes, *randomBytesSize);
@@ skipping 254 matching lines @@
   tpm_sha1_final(&sha1_ctx, buf);
   res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize);
   tpm_free(buf);
   if (res != TPM_SUCCESS) {
     free_TPM_KEY_PARMS(certifyInfo->algorithmParms);
     return res;
   }
   return TPM_SUCCESS;
 }