Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177752279
D59246.1795201741.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D59246.1795201741.diff
View Options
Index: sys/dev/tpm/tpm20.c
===================================================================
--- sys/dev/tpm/tpm20.c
+++ sys/dev/tpm/tpm20.c
@@ -30,6 +30,10 @@
#include "tpm20.h"
+#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM
+#include <dev/random/random_harvestq.h>
+#endif
+
#define TPM_HARVEST_SIZE 16
#define TPM2_ST_NO_SESSIONS 0x8001
@@ -58,6 +62,7 @@
#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM
static void tpm20_harvest(void *arg, int unused);
+static void tpm20_harvest_enqueue(const uint8_t *, size_t);
#endif
static int tpm20_command(device_t, uint32_t, uint16_t, uint32_t,
const char *);
@@ -386,6 +391,23 @@
}
#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM
+static void
+tpm20_harvest_enqueue(const uint8_t *entropy, size_t entropy_size)
+{
+ size_t chunk_size;
+
+ /* Preserve all RNG bytes rather than squashing an oversized event. */
+ chunk_size = sizeof(((struct harvest_event *)0)->he_entropy);
+ while (entropy_size != 0) {
+ size_t size;
+
+ size = MIN(entropy_size, chunk_size);
+ random_harvest_queue(entropy, (u_int)size, RANDOM_PURE_TPM);
+ entropy += size;
+ entropy_size -= size;
+ }
+}
+
/*
* Get TPM_HARVEST_SIZE random bytes and add them
* into system entropy pool.
@@ -432,7 +454,7 @@
sx_xunlock(&sc->dev_lock);
if (entropy_size > 0)
- random_harvest_queue(entropy, entropy_size, RANDOM_PURE_TPM);
+ tpm20_harvest_enqueue(entropy, entropy_size);
}
#endif /* TPM_HARVEST */
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 20, 7:09 PM (18 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41874124
Default Alt Text
D59246.1795201741.diff (1 KB)
Attached To
Mode
D59246: tpm20: Preserve all harvested random bytes
Attached
Detach File
Event Timeline