History

Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random

Pull /dev/random updates from Ted Ts'o: "This adds a memzero_explicit() call which is guaranteed not to be optimized away by GCC. This is important when we are wiping cryptographically sensitive material" * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random: crypto: memzero_explicit - make sure to clear out sensitive data random: add and use memzero_explicit() for clearing data

Linus Torvalds committed 12 years ago

Commit 14d4cc02 parents 1c45d9a 7185ad210 files · +36 −19Browse files

Showing the changes to include/linux (1 of 10 files). Show all

Unified · Split

include/linux/string.h+3−2
@@ -132,7 +132,7 @@ int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...) __printf(3, 4); · 131 unmodified lines
132132 #endif
133133
134134 extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
135− const void *from, size_t available);
135+ const void *from, size_t available);
136136
137137 /**
138138 * strstarts - does @str start with @prefix?
@@ -144,7 +144,8 @@ static inline bool strstarts(const char *str, const char *prefix) · 5 unmodified lines
144144 return strncmp(str, prefix, strlen(prefix)) == 0;
145145 }
146146
147−extern size_t memweight(const void *ptr, size_t bytes);
147+size_t memweight(const void *ptr, size_t bytes);
148+void memzero_explicit(void *s, size_t count);
148149
149150 /**
150151 * kbasename - return the last part of a pathname.