=== modified file 'Makefile'
--- Makefile 2013-10-20 21:04:35 +0000
+++ Makefile 2013-10-22 19:44:27 +0000
@@ -339,8 +339,6 @@
--target-directory=$(PREFIX)/lib/mandos plugin-runner
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
mandos-keygen
- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
- mandos-change-keytype
install --mode=u=rwx,go=rx \
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
plugins.d/password-prompt
@@ -409,7 +407,6 @@
! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
$(DESTDIR)/etc/crypttab
-rm --force $(PREFIX)/sbin/mandos-keygen \
- $(PREFIX)/sbin/mandos-change-keytype \
$(PREFIX)/lib/mandos/plugin-runner \
$(PREFIX)/lib/mandos/plugins.d/password-prompt \
$(PREFIX)/lib/mandos/plugins.d/mandos-client \
=== removed file 'mandos-change-keytype'
--- mandos-change-keytype 2013-10-20 22:20:11 +0000
+++ mandos-change-keytype 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-#!/bin/sh -e
-#
-# Mandos key regenerator - create a new OpenPGP key for a Mandos client
-#
-# Copyright © 2013 Teddy Hogeborn
-# Copyright © 2013 Björn Påhlsson
-#
-# This program 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.
-#
-# This program 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 .
-#
-# Contact the authors at .
-#
-
-PASSFILE="`mktemp -t mandos-change-keytype-key.XXXXXXXXXX`"
-
-# Remove temporary files on exit
-trap "
-set +e; \
-test -n \"$PASSFILE\" && shred --remove \"$PASSFILE\"; \
-" EXIT
-
-if [ -z "$PASSFILE" ]; then
- exit 1
-fi
-
-/usr/lib/mandos/plugins.d/mandos-client \
- --pubkey=/etc/keys/mandos/pubkey.txt \
- --seckey=/etc/keys/mandos/seckey.txt > "$PASSFILE"
-
-mandos-keygen --force "$@"
-
-mandos-keygen --passfile "$PASSFILE"