1 files changed, 6 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 07e32a87d95..44fce988eaa 100644
--- a/CREDITS
+++ b/CREDITS
@@ -688,10 +688,13 @@ S: Oxfordshire, UK.
 N: Kees Cook
 E: kees@outflux.net
-W: http://outflux.net/
+E: kees@ubuntu.com
-P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D
+E: keescook@chromium.org
-D: Minor updates to SCSI types, added /proc/pid/maps protection
+W: http://outflux.net/blog/
+P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026
+D: Various security things, bug fixes, and documentation.
 S: (ask for current address)
+S: Portland, Oregon
 S: USA
 N: Robin Cornelius

diff --git a/CREDITS b/CREDITS index 07e32a87d95..44fce988eaa 100644 --- a/CREDITS +++ b/CREDITS
@@ -688,10 +688,13 @@ S: Oxfordshire, UK.
688		688
689	N: Kees Cook	689	N: Kees Cook
690	E: kees@outflux.net	690	E: kees@outflux.net
691	W: http://outflux.net/	691	E: kees@ubuntu.com
692	P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30 1975 1FFF 4BA9 1706 3E6D	692	E: keescook@chromium.org
693	D: Minor updates to SCSI types, added /proc/pid/maps protection	693	W: http://outflux.net/blog/
		694	P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E 6E13 8972 F4DF DC6D C026
		695	D: Various security things, bug fixes, and documentation.
694	S: (ask for current address)	696	S: (ask for current address)
		697	S: Portland, Oregon
695	S: USA	698	S: USA
696		699
697	N: Robin Cornelius	700	N: Robin Cornelius