OpenBSD CVS

CVS log for src/usr.bin/ssh/hostfile.h


[BACK] Up to [local] / src / usr.bin / ssh

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.29 / (download) - annotate - [select for diffs], Tue Jan 26 00:51:30 2021 UTC (3 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, HEAD
Changes since 1.28: +5 -2 lines
Diff to previous 1.28 (colored)

make struct hostkeys public; I have no idea why I made it opaque
originally.

ok markus@

Revision 1.28 / (download) - annotate - [select for diffs], Sun Dec 20 23:36:51 2020 UTC (3 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.27: +13 -4 lines
Diff to previous 1.27 (colored)

load_hostkeys()/hostkeys_foreach() variants for FILE*

Add load_hostkeys_file() and hostkeys_foreach_file() that accept a
FILE* argument instead of opening the file directly.

Original load_hostkeys() and hostkeys_foreach() are implemented using
these new interfaces.

Add a u_int note field to the hostkey_entry and hostkey_foreach_line
structs that is passed directly from the load_hostkeys() and
hostkeys_foreach() call. This is a lightweight way to annotate results
between different invocations of load_hostkeys().

ok markus@

Revision 1.27 / (download) - annotate - [select for diffs], Sun Oct 4 09:45:01 2020 UTC (3 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.26: +2 -2 lines
Diff to previous 1.26 (colored)

when ordering host key algorithms in the client, consider the ECDSA
key subtype; ok markus@

Revision 1.26 / (download) - annotate - [select for diffs], Fri Jun 26 05:02:03 2020 UTC (3 years, 10 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.25: +3 -1 lines
Diff to previous 1.25 (colored)

Defer creation of ~/.ssh by ssh(1) until we attempt to write to it so we
don't leave an empty .ssh directory when it's not needed.  Use the same
function to replace the code in ssh-keygen that does the same thing.
bz#3156, ok djm@

Revision 1.25 / (download) - annotate - [select for diffs], Wed May 13 09:52:41 2020 UTC (4 years ago) by djm
Branch: MAIN
Changes since 1.24: +2 -1 lines
Diff to previous 1.24 (colored)

when ordering the hostkey algorithms to request from a server,
prefer certificate types if the known_hosts files contain a key
marked as a @cert-authority; bz#3157 ok markus@

Revision 1.24 / (download) - annotate - [select for diffs], Mon Feb 16 22:08:57 2015 UTC (9 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.23: +20 -11 lines
Diff to previous 1.23 (colored)

Refactor hostkeys_foreach() and dependent code
Deal with IP addresses (i.e. CheckHostIP)
Don't clobber known_hosts when nothing changed
ok markus@ as part of larger commit

Revision 1.23 / (download) - annotate - [select for diffs], Mon Jan 26 03:04:45 2015 UTC (9 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.22: +4 -1 lines
Diff to previous 1.22 (colored)

Host key rotation support.

Add a hostkeys@openssh.com protocol extension (global request) for
a server to inform a client of all its available host key after
authentication has completed. The client may record the keys in
known_hosts, allowing it to upgrade to better host key algorithms
and a server to gracefully rotate its keys.

The client side of this is controlled by a UpdateHostkeys config
option (default on).

ok markus@

Revision 1.22 / (download) - annotate - [select for diffs], Sun Jan 18 21:40:24 2015 UTC (9 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.21: +42 -1 lines
Diff to previous 1.21 (colored)

introduce hostkeys_foreach() to allow iteration over a
known_hosts file or controlled subset thereof. This will
allow us to pull out some ugly and duplicated code, and
will be used to implement hostkey rotation later.

feedback and ok markus

Revision 1.21 / (download) - annotate - [select for diffs], Thu Jan 15 09:40:00 2015 UTC (9 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.20: +6 -5 lines
Diff to previous 1.20 (colored)

sync ssh-keysign, ssh-keygen and some dependencies to the new
buffer/key API; mostly mechanical, ok markus@

Revision 1.20 / (download) - annotate - [select for diffs], Fri Jul 12 00:19:58 2013 UTC (10 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.19: +2 -2 lines
Diff to previous 1.19 (colored)

fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@

Revision 1.19 / (download) - annotate - [select for diffs], Mon Nov 29 23:45:51 2010 UTC (13 years, 5 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.18: +24 -6 lines
Diff to previous 1.18 (colored)

automatically order the hostkeys requested by the client based on
which hostkeys are already recorded in known_hosts. This avoids
hostkey warnings when connecting to servers with new ECDSA keys
that are preferred by default; with markus@

Revision 1.18 / (download) - annotate - [select for diffs], Thu Mar 4 10:36:03 2010 UTC (14 years, 2 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.17: +3 -2 lines
Diff to previous 1.17 (colored)

Add a TrustedUserCAKeys option to sshd_config to specify CA keys that
are trusted to authenticate users (in addition than doing it per-user
in authorized_keys).

Add a RevokedKeys option to sshd_config and a @revoked marker to
known_hosts to allow keys to me revoked and banned for user or host
authentication.

feedback and ok markus@

Revision 1.17 / (download) - annotate - [select for diffs], Fri Feb 26 20:29:54 2010 UTC (14 years, 2 months ago) by djm
Branch: MAIN
Changes since 1.16: +3 -1 lines
Diff to previous 1.16 (colored)

Add support for certificate key types for users and hosts.

OpenSSH certificate key types are not X.509 certificates, but a much
simpler format that encodes a public key, identity information and
some validity constraints and signs it with a CA key. CA keys are
regular SSH keys. This certificate style avoids the attack surface
of X.509 certificates and is very easy to deploy.

Certified host keys allow automatic acceptance of new host keys
when a CA certificate is marked as trusted in ~/.ssh/known_hosts.
see VERIFYING HOST KEYS in ssh(1) for details.

Certified user keys allow authentication of users when the signing
CA key is marked as trusted in authorized_keys. See "AUTHORIZED_KEYS
FILE FORMAT" in sshd(8) for details.

Certificates are minted using ssh-keygen(1), documentation is in
the "CERTIFICATES" section of that manpage.

Documentation on the format of certificates is in the file
PROTOCOL.certkeys

feedback and ok markus@

Revision 1.15.4.1 / (download) - annotate - [select for diffs], Fri Oct 6 03:19:32 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.15: +1 -1 lines
Diff to previous 1.15 (colored) next main 1.16 (colored)

upgrade to OpenSSH 4.4

Revision 1.15.6.1 / (download) - annotate - [select for diffs], Sat Sep 30 04:06:50 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_9
Changes since 1.15: +1 -1 lines
Diff to previous 1.15 (colored) next main 1.16 (colored)

upgrade to OpenSSH 4.4

Revision 1.16 / (download) - annotate - [select for diffs], Sat Mar 25 22:22:43 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.15: +1 -1 lines
Diff to previous 1.15 (colored)

standardise spacing in $OpenBSD$ tags; requested by deraadt@

Revision 1.14.2.1 / (download) - annotate - [select for diffs], Thu Mar 10 17:15:04 2005 UTC (19 years, 2 months ago) by brad
Branch: OPENBSD_3_5
Changes since 1.14: +7 -2 lines
Diff to previous 1.14 (colored) next main 1.15 (colored)

upgrade to OpenSSH 4.0

Revision 1.14.4.1 / (download) - annotate - [select for diffs], Thu Mar 10 16:28:27 2005 UTC (19 years, 2 months ago) by brad
Branch: OPENBSD_3_6
Changes since 1.14: +7 -2 lines
Diff to previous 1.14 (colored) next main 1.15 (colored)

upgrade to OpenSSH 4.0

Revision 1.15 / (download) - annotate - [select for diffs], Tue Mar 1 10:40:26 2005 UTC (19 years, 2 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_8_BASE, OPENBSD_3_7_BASE, OPENBSD_3_7
Branch point for: OPENBSD_3_9, OPENBSD_3_8
Changes since 1.14: +7 -2 lines
Diff to previous 1.14 (colored)

add support for hashing host names and addresses added to known_hosts files,
to improve privacy of which hosts user have been visiting; ok markus@ deraadt@

Revision 1.13.2.1 / (download) - annotate - [select for diffs], Thu Mar 4 18:18:15 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored) next main 1.14 (colored)

upgrade to OpenSSH 3.8upgrade to OpenSSH 3.8upgrade to OpenSSH 3.8

Revision 1.13.4.1 / (download) - annotate - [select for diffs], Sat Feb 28 03:51:33 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored) next main 1.14 (colored)

upgrade to OpenSSH 3.8

Revision 1.14 / (download) - annotate - [select for diffs], Mon Nov 10 16:23:41 2003 UTC (20 years, 6 months ago) by jakob
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE, OPENBSD_3_5_BASE
Branch point for: OPENBSD_3_6, OPENBSD_3_5
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

constify. ok markus@ & djm@

Revision 1.12.2.2 / (download) - annotate - [select for diffs], Tue Sep 16 21:20:25 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_2
Changes since 1.12.2.1: +0 -0 lines
Diff to previous 1.12.2.1 (colored) to branchpoint 1.12 (colored) next main 1.13 (colored)

upgrade to OpenSSH 3.7

Revision 1.10.2.2 / (download) - annotate - [select for diffs], Thu Apr 3 22:35:17 2003 UTC (21 years, 1 month ago) by miod
Branch: OPENBSD_3_1
Changes since 1.10.2.1: +6 -6 lines
Diff to previous 1.10.2.1 (colored) to branchpoint 1.10 (colored) next main 1.11 (colored)

Merge OpenSSH 3.6.1

Revision 1.12.2.1 / (download) - annotate - [select for diffs], Tue Apr 1 00:12:13 2003 UTC (21 years, 1 month ago) by margarida
Branch: OPENBSD_3_2
Changes since 1.12: +6 -6 lines
Diff to previous 1.12 (colored)

Update to OpenSSH 3.6

Revision 1.13 / (download) - annotate - [select for diffs], Thu Nov 21 23:03:51 2002 UTC (21 years, 5 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_3_BASE
Branch point for: OPENBSD_3_4, OPENBSD_3_3
Changes since 1.12: +6 -6 lines
Diff to previous 1.12 (colored)

KNF

Revision 1.9.2.2 / (download) - annotate - [select for diffs], Fri Oct 11 14:53:06 2002 UTC (21 years, 7 months ago) by miod
Branch: OPENBSD_3_0
Changes since 1.9.2.1: +4 -2 lines
Diff to previous 1.9.2.1 (colored) to branchpoint 1.9 (colored) next main 1.10 (colored)

Update to OpenSSH 3.5

Revision 1.10.2.1 / (download) - annotate - [select for diffs], Fri Oct 11 14:51:52 2002 UTC (21 years, 7 months ago) by miod
Branch: OPENBSD_3_1
Changes since 1.10: +4 -2 lines
Diff to previous 1.10 (colored)

Update to OpenSSH 3.5

Revision 1.12 / (download) - annotate - [select for diffs], Sun Sep 8 20:24:08 2002 UTC (21 years, 8 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE
Branch point for: OPENBSD_3_2
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

no comma at end of enumerator list

Revision 1.11 / (download) - annotate - [select for diffs], Wed Jul 24 16:11:18 2002 UTC (21 years, 9 months ago) by markus
Branch: MAIN
Changes since 1.10: +4 -2 lines
Diff to previous 1.10 (colored)

print out all known keys for a host if we get a unknown host key,
see discussion at http://marc.theaimsgroup.com/?t=101069210100016&r=1&w=4

the ssharp mitm tool attacks users in a similar way, so i'd like to
pointed out again:
	A MITM attack is always possible if the ssh client prints:
	The authenticity of host 'bla' can't be established.
(protocol version 2 with pubkey authentication allows you to detect
MITM attacks)

Revision 1.7.2.2 / (download) - annotate - [select for diffs], Sat Mar 9 00:20:44 2002 UTC (22 years, 2 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.7.2.1: +2 -2 lines
Diff to previous 1.7.2.1 (colored) to branchpoint 1.7 (colored) next main 1.8 (colored)

Merge OpenSSH 3.1, keeping /etc as configuration files directory.
(i.e. OpenSSH 3.1 + openbsd29_3.1.patch)

Revision 1.4.2.6 / (download) - annotate - [select for diffs], Fri Mar 8 17:04:42 2002 UTC (22 years, 2 months ago) by brad
Branch: OPENBSD_2_8
Changes since 1.4.2.5: +2 -2 lines
Diff to previous 1.4.2.5 (colored) to branchpoint 1.4 (colored) next main 1.5 (colored)

Merge OpenSSH 3.1.

Revision 1.9.2.1 / (download) - annotate - [select for diffs], Thu Mar 7 17:37:46 2002 UTC (22 years, 2 months ago) by jason
Branch: OPENBSD_3_0
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

Update to OpenSSH-3.1 on 3.0-stable branch

Revision 1.10 / (download) - annotate - [select for diffs], Tue Dec 18 10:04:21 2001 UTC (22 years, 5 months ago) by jakob
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE
Branch point for: OPENBSD_3_1
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

remove auth_rsa_read_key, make hostfile_ready_key non static; ok markus@

Revision 1.7.2.1 / (download) - annotate - [select for diffs], Thu Sep 27 19:03:54 2001 UTC (22 years, 7 months ago) by jason
Branch: OPENBSD_2_9
Changes since 1.7: +4 -18 lines
Diff to previous 1.7 (colored)

Pull in OpenSSH-2.9.9

Revision 1.4.2.5 / (download) - annotate - [select for diffs], Thu Sep 27 00:15:42 2001 UTC (22 years, 7 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.4.2.4: +4 -18 lines
Diff to previous 1.4.2.4 (colored) to branchpoint 1.4 (colored)

Pull in OpenSSH 2.9.9 to the 2.8 branch.

Revision 1.9 / (download) - annotate - [select for diffs], Tue Jun 26 17:27:23 2001 UTC (22 years, 10 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE
Branch point for: OPENBSD_3_0
Changes since 1.8: +3 -16 lines
Diff to previous 1.8 (colored)

remove comments from .h, since they are cut&paste from the .c files
and out of sync

Revision 1.8 / (download) - annotate - [select for diffs], Tue Jun 26 06:32:53 2001 UTC (22 years, 10 months ago) by itojun
Branch: MAIN
Changes since 1.7: +4 -5 lines
Diff to previous 1.7 (colored)

prototype pedant.  not very creative...
- () -> (void)
- no variable names

Revision 1.4.2.4 / (download) - annotate - [select for diffs], Mon May 7 21:09:30 2001 UTC (23 years ago) by jason
Branch: OPENBSD_2_8
Changes since 1.4.2.3: +0 -0 lines
Diff to previous 1.4.2.3 (colored) to branchpoint 1.4 (colored)

Pull in OpenSSH-2.9 to 2.8 branch.

Revision 1.4.2.3 / (download) - annotate - [select for diffs], Wed Mar 21 19:46:25 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.4.2.2: +0 -0 lines
Diff to previous 1.4.2.2 (colored) to branchpoint 1.4 (colored)

Pull in OpenSSH-2.5.2 for 2.8 branch.

Revision 1.2.2.3 / (download) - annotate - [select for diffs], Wed Mar 21 18:52:46 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.2.2.2: +0 -0 lines
Diff to previous 1.2.2.2 (colored) to branchpoint 1.2 (colored) next main 1.3 (colored)

Pull in OpenSSH-2.5.2 for 2.7 branch.

Revision 1.2.2.2 / (download) - annotate - [select for diffs], Mon Mar 12 15:44:10 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.2.2.1: +8 -1 lines
Diff to previous 1.2.2.1 (colored) to branchpoint 1.2 (colored)

OpenSSH-2.5.1 for 2.7 patch branch

Revision 1.4.2.2 / (download) - annotate - [select for diffs], Mon Feb 19 17:18:58 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.4.2.1: +0 -0 lines
Diff to previous 1.4.2.1 (colored) to branchpoint 1.4 (colored)

Pull in OpenSSH-2.5.1

Revision 1.4.2.1 / (download) - annotate - [select for diffs], Fri Feb 16 20:13:03 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.4: +8 -1 lines
Diff to previous 1.4 (colored)

Pull in OpenSSH 2.5.0

Revision 1.7 / (download) - annotate - [select for diffs], Thu Feb 8 19:30:51 2001 UTC (23 years, 3 months ago) by itojun
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE
Branch point for: OPENBSD_2_9
Changes since 1.6: +4 -1 lines
Diff to previous 1.6 (colored)

sync with netbsd tree changes.
- more strict prototypes, include necessary headers
- use paths.h/pathnames.h decls
- size_t typecase to int -> u_long

Revision 1.6 / (download) - annotate - [select for diffs], Mon Jan 29 01:58:16 2001 UTC (23 years, 3 months ago) by niklas
Branch: MAIN
Changes since 1.5: +2 -0 lines
Diff to previous 1.5 (colored)

$OpenBSD$

Revision 1.5 / (download) - annotate - [select for diffs], Thu Dec 21 15:10:17 2000 UTC (23 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.4: +3 -1 lines
Diff to previous 1.4 (colored)

print keyfile:line for changed hostkeys, for deraadt@; ok deraadt@

Revision 1.2.2.1 / (download) - annotate - [select for diffs], Wed Nov 8 21:30:49 2000 UTC (23 years, 6 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.2: +11 -0 lines
Diff to previous 1.2 (colored)

openssh-2.3.0 (again) for 2.7 branch

Revision 1.4 / (download) - annotate - [select for diffs], Thu Sep 7 21:13:37 2000 UTC (23 years, 8 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE
Branch point for: OPENBSD_2_8
Changes since 1.3: +8 -20 lines
Diff to previous 1.3 (colored)

some more Copyright fixes

Revision 1.3 / (download) - annotate - [select for diffs], Thu Sep 7 20:27:51 2000 UTC (23 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.2: +23 -0 lines
Diff to previous 1.2 (colored)

cleanup copyright notices on all files.  I have attempted to be accurate with
the details.  everything is now under Tatu's licence (which I copied from his
readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd
developers under a 2-term bsd licence.  We're not changing any rules, just
being accurate.

Revision 1.2 / (download) - annotate - [select for diffs], Fri Apr 14 10:30:31 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE
Branch point for: OPENBSD_2_7
Changes since 1.1: +1 -1 lines
Diff to previous 1.1 (colored)

whitespace cleanup

Revision 1.1 / (download) - annotate - [select for diffs], Thu Mar 23 22:15:33 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN

initial support for DSA keys. ok deraadt@, niels@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.