From c549cb25a17b78fd0b38ea6c64b269c65f29f462 Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Mon, 26 Dec 2016 19:09:53 +0100 Subject: [PATCH 1/2] Detect Ed25519 keys as well Ed255519 keys generated by OpenSSH contain "BEGIN OPENSSH PRIVATE KEY" as identifier. This commit adds coverage for such keys as well. --- pre_commit_hooks/detect_private_key.py | 1 + tests/detect_private_key_test.py | 1 + 2 files changed, 2 insertions(+) diff --git a/pre_commit_hooks/detect_private_key.py b/pre_commit_hooks/detect_private_key.py index 1a4f323..0c2eca4 100644 --- a/pre_commit_hooks/detect_private_key.py +++ b/pre_commit_hooks/detect_private_key.py @@ -7,6 +7,7 @@ BLACKLIST = [ b'BEGIN RSA PRIVATE KEY', b'BEGIN DSA PRIVATE KEY', b'BEGIN EC PRIVATE KEY', + b'BEGIN OPENSSH PRIVATE KEY' ] diff --git a/tests/detect_private_key_test.py b/tests/detect_private_key_test.py index 4f2bb93..c6558ba 100644 --- a/tests/detect_private_key_test.py +++ b/tests/detect_private_key_test.py @@ -7,6 +7,7 @@ TESTS = ( (b'-----BEGIN RSA PRIVATE KEY-----', 1), (b'-----BEGIN DSA PRIVATE KEY-----', 1), (b'-----BEGIN EC PRIVATE KEY-----', 1), + (b'-----BEGIN OPENSSH PRIVATE KEY-----', 1), (b'ssh-rsa DATA', 0), (b'ssh-dsa DATA', 0), # Some arbitrary binary data From cdb3e2e4bff2630db9d764652b117f4ed6919a6a Mon Sep 17 00:00:00 2001 From: Chris Kuehl Date: Mon, 26 Dec 2016 14:51:26 -0800 Subject: [PATCH 2/2] Add trailing comma --- pre_commit_hooks/detect_private_key.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre_commit_hooks/detect_private_key.py b/pre_commit_hooks/detect_private_key.py index 0c2eca4..d187364 100644 --- a/pre_commit_hooks/detect_private_key.py +++ b/pre_commit_hooks/detect_private_key.py @@ -7,7 +7,7 @@ BLACKLIST = [ b'BEGIN RSA PRIVATE KEY', b'BEGIN DSA PRIVATE KEY', b'BEGIN EC PRIVATE KEY', - b'BEGIN OPENSSH PRIVATE KEY' + b'BEGIN OPENSSH PRIVATE KEY', ]