diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-03-02 03:36:23 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-03-02 03:36:23 +0000 |
commit | aaacaefd8a5dd9d0c573bb290a5100cab2c0bd7b (patch) | |
tree | 0c8f70cf8481165d4bdc1e05b513aeb66d639ff9 /distrib/miniroot | |
parent | 2789e86f4d95bebca409929f753dedc645ab1d1b (diff) |
move to official keys
Diffstat (limited to 'distrib/miniroot')
-rw-r--r-- | distrib/miniroot/install.sub | 4 | ||||
-rw-r--r-- | distrib/miniroot/list | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 24f0d3d15eb..f2a587ced7e 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.750 2014/02/28 23:51:54 krw Exp $ +# $OpenBSD: install.sub,v 1.751 2014/03/02 03:36:22 deraadt Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1266,7 +1266,7 @@ install_files() { _issue="Cannot fetch SHA256.sig" && break # Verify signature file with public keys - ! signify -Vep /etc/signify/${VERSION}base.pub \ + ! signify -Vep /etc/signify/openbsd-${VERSION}-base.pub \ -x "$_cfile.sig" -m "$_cfile" && _issue="Signature check of SHA256.sig failed" && break diff --git a/distrib/miniroot/list b/distrib/miniroot/list index 147f776f189..b8676bd03db 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.56 2014/02/21 19:14:23 deraadt Exp $ +# $OpenBSD: list,v 1.57 2014/03/02 03:36:22 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -57,7 +57,7 @@ LINK instbin usr/bin/signify COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../miniroot/master.passwd etc/master.passwd SPECIAL pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd -COPY ${DESTDIR}/etc/signify/${REV}base.pub etc/signify/${REV}base.pub +COPY ${DESTDIR}/etc/signify/openbsd-${REV}-base.pub etc/signify/openbsd-${REV}-base.pub COPY ${CURDIR}/../miniroot/protocols etc/protocols COPY ${CURDIR}/../miniroot/services etc/services |