security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-11 22:01:08 +02:00
Code Activity

tests: Log information about ssh, add comments to test.

Browse Source 
* tests/openpgp/ssh-import.scm (ssh-version-string): New variable, and
log the binary and version used in the test.
(ssh-supports?): Document how we test what algorithms are supported by
ssh, and log ssh-keygen's replies.
--
We have some trouble with this test on macOS, and adding some more
information in verbose mode will hopefully make tracking down these
problems easier in the future.

GnuPG-bug-id: 2980
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-03-02 10:41:03 +01:00
parent e064c75b08
commit 74cb3b230c
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/openpgp/ssh-import.scm
View File

@ -36,8 +36,13 @@
(catch (skip "ssh-keygen not found") (catch (skip "ssh-keygen not found")
(set! ssh-keygen (path-expand "ssh-keygen" path))) (set! ssh-keygen (path-expand "ssh-keygen" path)))
(define ssh-version-string
(:stderr (call-with-io `(,ssh "-V") "")))
(log "Using" ssh "version:" ssh-version-string)
(define ssh-version (define ssh-version
(let ((tmp (:stderr (call-with-io `(,ssh "-V") ""))) (let ((tmp ssh-version-string)
(prefix "OpenSSH_")) (prefix "OpenSSH_"))
(unless (string-prefix? tmp prefix) (unless (string-prefix? tmp prefix)
(skip "This doesn't look like OpenSSH:" tmp)) (skip "This doesn't look like OpenSSH:" tmp))
@ -45,14 +50,22 @@
(+ 3 (string-length prefix)))))) (+ 3 (string-length prefix))))))
(define (ssh-supports? algorithm) (define (ssh-supports? algorithm)
;; We exploit ssh-keygen as an oracle to test what algorithms ssh
;; supports.
(cond (cond
((equal? algorithm "ed25519") ((equal? algorithm "ed25519")
;; Unfortunately, our oracle does not work for ed25519 because
;; this is a specific curve and not a family, so the key size
;; parameter is ignored.
(>= ssh-version 6.5)) (>= ssh-version 6.5))
(else (else
(not (string-contains? (:stderr (call-with-io `(,ssh-keygen ;; We call ssh-keygen with the algorithm to test, specify an
-t ,algorithm ;; invalid key size, and observe the error message.
-b "1009") "")) (let ((output (:stderr (call-with-io `(,ssh-keygen
"unknown key type"))))) -t ,algorithm
-b "1009") ""))))
(log "(ssh-supports?" algorithm "), ssh algorithm oracle replied:" output)
(not (string-contains? output "unknown key type"))))))
(define keys (define keys
'(("dsa" "9a:e1:f1:5f:46:ea:a5:06:e1:e2:f8:38:8e:06:54:58") '(("dsa" "9a:e1:f1:5f:46:ea:a5:06:e1:e2:f8:38:8e:06:54:58")