update to keychain-2.8.2, revise DESCR

This commit is contained in:
sthen 2016-01-28 15:08:45 +00:00
parent 4460b67a6d
commit 38613ae358
4 changed files with 12 additions and 46 deletions

View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.24 2015/06/29 16:43:10 jca Exp $
# $OpenBSD: Makefile,v 1.25 2016/01/28 15:08:45 sthen Exp $
COMMENT= front-end to ssh-agent
COMMENT= front-end to ssh-agent and gpg-agent
DISTNAME= keychain-2.7.1
DISTNAME= keychain-2.8.2
CATEGORIES= security
REVISION= 1
HOMEPAGE= http://www.funtoo.org/Keychain
# GPLv2

View File

@ -1,2 +1,2 @@
SHA256 (keychain-2.7.1.tar.bz2) = EQf+P3j2Qp1IYdZMVmbwaPFZMm0iq4Co7QlIyyU3UZE=
SIZE (keychain-2.7.1.tar.bz2) = 51379
SHA256 (keychain-2.8.2.tar.bz2) = dIlYMil2FqGpUegaVmA/L8blRJV2QR+LEipcyTOuMwE=
SIZE (keychain-2.8.2.tar.bz2) = 34187

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-keychain,v 1.7 2015/01/09 18:48:29 robert Exp $
--- keychain.orig Fri Jan 9 19:46:55 2015
+++ keychain Fri Jan 9 19:46:57 2015
@@ -812,6 +812,11 @@ extract_fingerprints() {
# 1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA)
echo "$ef_line" | cut -f2 -d' '
;;
+ *\ MD5:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:*)
+ # The new OpenSSH format with ssh-add -l -E md5
+ # 2048 MD5:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_rsa (RSA)
+ echo "$ef_line" | cut -f2 -d' '
+ ;;
*)
# Fall back to filename. Note that commercial ssh is handled
# explicitly in ssh_l and ssh_f, so hopefully this rule will
@@ -827,7 +832,7 @@ extract_fingerprints() {
# synopsis: ssh_l
# Return space-separated list of known fingerprints
ssh_l() {
- sl_mylist=`ssh-add -l 2>/dev/null`
+ sl_mylist=`ssh-add -l -E md5 2>/dev/null`
sl_retval=$?
if $openssh; then
@@ -893,7 +898,7 @@ ssh_f() {
warn "$sf_filename.pub missing; can't tell if $sf_filename is loaded"
return 1
fi
- sf_fing=`ssh-keygen -l -f "$sf_filename.pub"` || return 1
+ sf_fing=`ssh-keygen -l -E md5 -f "$sf_filename.pub"` || return 1
echo "$sf_fing" | extract_fingerprints
else
# can't get fingerprint for ssh2 so use filename *shrug*

View File

@ -1,6 +1,7 @@
The keychain shell script makes handling RSA and DSA keys both
convenient and secure. It acts as a front-end to ssh-agent, allowing
you to easily have one long-running ssh-agent process per system,
rather than per login session. This dramatically reduces the number
of times you need to enter your passphrase from once per new login
session to once every time your local machine is rebooted.
Keychain helps you to manage SSH and GPG keys in a convenient and secure
manner. It acts as a frontend to ssh-agent and ssh-add, but allows you
to easily have one long running ssh-agent process per system, rather
than the norm of one ssh-agent per login session. Keychain also makes
it easy for remote cron jobs to securely "hook in" to a long-running
ssh-agent process, allowing your scripts to take advantage of key-based
logins.