mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-09 21:28:51 +01:00
7e19786a5d
* tests/gpgscm/tests.scm (mkdtemp): Do not magically obey the environment variable 'TMP', make sure to always return an absolute path. * tests/gpgme/Makefile.am (TMP): Drop variable. (TESTS_ENVIRONMENT): Drop 'TMP'. * tests/gpgme/gpgme-defs.scm (create-gpgmehome): Start the agent. Do not create private key store, the agent does that for us. * tests/gpgsm/Makefile.am (TMP): Drop variable. (TESTS_ENVIRONMENT): Drop 'TMP'. * tests/gpgme/gpgme-defs.scm (create-gpgsmhome): Start the agent. Do not create private key store, the agent does that for us. * tests/migrations/Makefile.am (TMP): Drop variable. (TESTS_ENVIRONMENT): Drop 'TMP'. * tests/migrations/common.scm (gpgconf): New variable. (run-test): Create and remove socket directory. * tests/migrations/extended-pkf.scm (src-tarball): Remove variable. (setup): Remove function. (trigger-migration): Likewise. Use 'run-test' to execute the test. * tests/migrations/from-classic.scm (src-tarball): Remove variable. (setup): Remove function. Use 'run-test' to execute the tests. * tests/openpgp/Makefile.am (TMP): Drop variable. (TESTS_ENVIRONMENT): Drop 'TMP'. * tests/openpgp/README: Do not mention 'TMP'. * tests/openpgp/defs.scm (with-home-directory): New macro. (create-legacy-gpghome): Do not create private key store, the agent does that for us. (start-agent): Make sure to terminate the right agent with 'atexit'. -- Previously, the test suite relied upon creating home directories in '/tmp'. This has been problematic in some build environments, although POSIX mandates that '/tmp' must be available. We now rely on 'gpgconf --create-socketdir' to create a suitable socket directory for us. This allows us to get rid of some cruft. It also aligns the environment the tests are run in closer with the environment that we intend that GnuPG runs in. Signed-off-by: Justus Winter <justus@g10code.com>
104 lines
3.3 KiB
Scheme
104 lines
3.3 KiB
Scheme
;; Common definitions for the GPGSM test scripts.
|
|
;;
|
|
;; 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 <http://www.gnu.org/licenses/>.
|
|
|
|
(load (with-path "defs.scm"))
|
|
|
|
;; This is the list of certificates that we install in the test
|
|
;; environment.
|
|
(define certs
|
|
(package
|
|
(define (new fpr issuer-fpr uid)
|
|
(package))
|
|
(define (new-uid CN OU O L C)
|
|
(package))
|
|
(define test-1 (new "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E"
|
|
"3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E"
|
|
(new-uid "test cert 1"
|
|
"Aegypten Project"
|
|
"g10 Code GmbH"
|
|
"Düsseldorf"
|
|
"DE")))))
|
|
(define all-certs (list certs::test-1))
|
|
|
|
(define gpgsm `(,(tool 'gpgsm) --yes)) ;; more/less options
|
|
|
|
(define (tr:gpgsm input args)
|
|
(tr:spawn input `(,@gpgsm --output **out** ,@args **in**)))
|
|
|
|
(define (pipe:gpgsm args)
|
|
(pipe:spawn `(,@gpgsm --output - ,@args -)))
|
|
|
|
(define (gpgsm-with-colons args)
|
|
(let ((s (call-popen `(,@gpgsm --with-colons ,@args) "")))
|
|
(map (lambda (line) (string-split line #\:))
|
|
(string-split-newlines s))))
|
|
|
|
(define (sm-have-public-key? key)
|
|
(catch #f
|
|
(pair? (filter (lambda (l) (and (equal? 'fpr (:type l))
|
|
(equal? key::fpr (:fpr l))))
|
|
(gpgsm-with-colons `(--list-keys ,key::fpr))))))
|
|
|
|
(define (sm-have-secret-key? key)
|
|
(catch #f
|
|
(pair? (filter (lambda (l) (and (equal? 'fpr (:type l))
|
|
(equal? key::fpr (:fpr l))))
|
|
(gpgsm-with-colons `(--list-secret-keys ,key::fpr))))))
|
|
|
|
(define (create-file name . lines)
|
|
(letfd ((fd (open name (logior O_WRONLY O_CREAT O_BINARY) #o600)))
|
|
(let ((port (fdopen fd "wb")))
|
|
(for-each (lambda (line) (display line port) (newline port))
|
|
lines))))
|
|
|
|
(define (create-gpgsmhome)
|
|
(create-file "gpgsm.conf"
|
|
"disable-crl-checks"
|
|
"faked-system-time 1008241200")
|
|
(create-file "gpg-agent.conf"
|
|
(string-append "pinentry-program " (tool 'pinentry)))
|
|
(start-agent)
|
|
(create-file
|
|
"trustlist.txt"
|
|
"32100C27173EF6E9C4E9A25D3D69F86D37A4F939"
|
|
"# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE"
|
|
"3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E S")
|
|
|
|
(log "Storing private keys")
|
|
(for-each
|
|
(lambda (name)
|
|
(file-copy (in-srcdir name)
|
|
(path-join "private-keys-v1.d"
|
|
(string-append name ".key"))))
|
|
'("32100C27173EF6E9C4E9A25D3D69F86D37A4F939"))
|
|
|
|
(log "Importing public demo and test keys")
|
|
(call-check `(,@gpgsm --import ,(in-srcdir "cert_g10code_test1.der")))
|
|
|
|
(create-sample-files)
|
|
(stop-agent))
|
|
|
|
;; Initialize the test environment, install appropriate configuration
|
|
;; and start the agent, with the keys from the legacy test suite.
|
|
(define (setup-gpgsm-environment)
|
|
(if (member "--unpack-tarball" *args*)
|
|
(call-check `(,(tool 'gpgtar) --extract --directory=. ,(cadr *args*)))
|
|
(create-gpgsm-gpghome))
|
|
(start-agent))
|