From cc1d21342659a7def5d662d0547579f9e0d3b109 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 28 Nov 2016 12:36:33 +0100 Subject: tests: Rename ssh test. * tests/openpgp/ssh.scm: Rename to 'ssh-import.scm'. * tests/openpgp/Makefile (XTESTS): Likewise. Signed-off-by: Justus Winter --- tests/openpgp/Makefile.am | 2 +- tests/openpgp/ssh-import.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++ tests/openpgp/ssh.scm | 67 -------------------------------------------- 3 files changed, 68 insertions(+), 68 deletions(-) create mode 100755 tests/openpgp/ssh-import.scm delete mode 100755 tests/openpgp/ssh.scm diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index 8f565b338..532cdb33e 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -80,7 +80,7 @@ XTESTS = \ use-exact-key.scm \ default-key.scm \ export.scm \ - ssh.scm \ + ssh-import.scm \ quick-key-manipulation.scm \ key-selection.scm \ issue2015.scm \ diff --git a/tests/openpgp/ssh-import.scm b/tests/openpgp/ssh-import.scm new file mode 100755 index 000000000..a825409d6 --- /dev/null +++ b/tests/openpgp/ssh-import.scm @@ -0,0 +1,67 @@ +#!/usr/bin/env gpgscm + +;; Copyright (C) 2016 g10 Code GmbH +;; +;; This file is part of GnuPG. +;; +;; GnuPG is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3 of the License, or +;; (at your option) any later version. +;; +;; GnuPG is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this program; if not, see . + +(load (with-path "defs.scm")) +(setup-environment) + +(define GNUPGHOME (getenv "GNUPGHOME")) +(if (string=? "" GNUPGHOME) + (error "GNUPGHOME not set")) + +(setenv "SSH_AUTH_SOCK" + (call-check `(,(tool 'gpgconf) --null --list-dirs agent-ssh-socket)) + #t) + +(define SSH-ADD #f) +(catch (skip "ssh-add not found") + (set! SSH-ADD + (path-expand "ssh-add" (string-split (getenv "PATH") *pathsep*)))) + +(define keys + '(("dsa" "9a:e1:f1:5f:46:ea:a5:06:e1:e2:f8:38:8e:06:54:58") + ("rsa" "c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22") + ("ecdsa" "93:37:30:a6:4e:e7:6a:22:79:77:8e:bf:ed:14:e9:8e") + ("ed25519" "08:df:be:af:d2:f5:32:20:3a:1c:56:06:be:31:0f:bf"))) + +(for-each-p' + "Importing ssh keys..." + (lambda (key) + (let ((file (path-join (in-srcdir "samplekeys") + (string-append "ssh-" (car key) ".key"))) + (hash (cadr key))) + ;; We pipe the key to ssh-add so that it won't complain about + ;; file's permissions. + (pipe:do + (pipe:open file (logior O_RDONLY O_BINARY)) + (pipe:spawn `(,SSH-ADD -))) + (unless (string-contains? (call-popen `(,SSH-ADD -l "-E" md5) "") hash) + (error "key not added")))) + car keys) + +(info "Checking for issue2316...") +(unlink (string-append GNUPGHOME "/sshcontrol")) +(pipe:do + (pipe:open (path-join (in-srcdir "samplekeys") + (string-append "ssh-rsa.key")) + (logior O_RDONLY O_BINARY)) + (pipe:spawn `(,SSH-ADD -))) +(unless + (string-contains? (call-popen `(,SSH-ADD -l "-E" md5) "") + "c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22") + (error "known private key not (re-)added to sshcontrol")) diff --git a/tests/openpgp/ssh.scm b/tests/openpgp/ssh.scm deleted file mode 100755 index a825409d6..000000000 --- a/tests/openpgp/ssh.scm +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env gpgscm - -;; Copyright (C) 2016 g10 Code GmbH -;; -;; This file is part of GnuPG. -;; -;; GnuPG is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3 of the License, or -;; (at your option) any later version. -;; -;; GnuPG is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program; if not, see . - -(load (with-path "defs.scm")) -(setup-environment) - -(define GNUPGHOME (getenv "GNUPGHOME")) -(if (string=? "" GNUPGHOME) - (error "GNUPGHOME not set")) - -(setenv "SSH_AUTH_SOCK" - (call-check `(,(tool 'gpgconf) --null --list-dirs agent-ssh-socket)) - #t) - -(define SSH-ADD #f) -(catch (skip "ssh-add not found") - (set! SSH-ADD - (path-expand "ssh-add" (string-split (getenv "PATH") *pathsep*)))) - -(define keys - '(("dsa" "9a:e1:f1:5f:46:ea:a5:06:e1:e2:f8:38:8e:06:54:58") - ("rsa" "c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22") - ("ecdsa" "93:37:30:a6:4e:e7:6a:22:79:77:8e:bf:ed:14:e9:8e") - ("ed25519" "08:df:be:af:d2:f5:32:20:3a:1c:56:06:be:31:0f:bf"))) - -(for-each-p' - "Importing ssh keys..." - (lambda (key) - (let ((file (path-join (in-srcdir "samplekeys") - (string-append "ssh-" (car key) ".key"))) - (hash (cadr key))) - ;; We pipe the key to ssh-add so that it won't complain about - ;; file's permissions. - (pipe:do - (pipe:open file (logior O_RDONLY O_BINARY)) - (pipe:spawn `(,SSH-ADD -))) - (unless (string-contains? (call-popen `(,SSH-ADD -l "-E" md5) "") hash) - (error "key not added")))) - car keys) - -(info "Checking for issue2316...") -(unlink (string-append GNUPGHOME "/sshcontrol")) -(pipe:do - (pipe:open (path-join (in-srcdir "samplekeys") - (string-append "ssh-rsa.key")) - (logior O_RDONLY O_BINARY)) - (pipe:spawn `(,SSH-ADD -))) -(unless - (string-contains? (call-popen `(,SSH-ADD -l "-E" md5) "") - "c9:85:b5:55:00:84:a9:82:5a:df:d6:62:1b:5a:28:22") - (error "known private key not (re-)added to sshcontrol")) -- cgit v1.2.3