OpenBSD CVS

CVS log for src/usr.bin/ssh/Attic/kexdhc.c


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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.30, Mon Jan 21 10:28:02 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: HEAD
Changes since 1.29: +1 -1 lines
FILE REMOVED

use KEM API for vanilla DH KEX

from markus@ ok djm@

Revision 1.29 / (download) - annotate - [select for diffs], Mon Jan 21 10:07:22 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.28: +2 -14 lines
Diff to previous 1.28 (colored)

factor out kex_verify_hostkey() - again, duplicated almost exactly
across client and server for several KEX methods.

from markus@ ok djm@

Revision 1.28 / (download) - annotate - [select for diffs], Mon Jan 21 10:03:37 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.27: +11 -34 lines
Diff to previous 1.27 (colored)

factor out kex_dh_compute_key() - it's shared between plain DH KEX and
DH GEX in both the client and server implementations

from markus@ ok djm@

Revision 1.27 / (download) - annotate - [select for diffs], Mon Jan 21 10:00:23 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.26: +3 -25 lines
Diff to previous 1.26 (colored)

factor out DH keygen; it's identical between the client and the server

from markus@ ok djm@

Revision 1.26 / (download) - annotate - [select for diffs], Mon Jan 21 09:55:52 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.25: +1 -12 lines
Diff to previous 1.25 (colored)

save the derived session id in kex_derive_keys() rather than making each
kex method implementation do it.

from markus@ ok djm@

Revision 1.25 / (download) - annotate - [select for diffs], Mon Jan 21 09:54:11 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.24: +3 -8 lines
Diff to previous 1.24 (colored)

Make sshpkt_get_bignum2() allocate the bignum it is parsing rather
than make the caller do it. Saves a lot of boilerplate code.

from markus@ ok djm@

Revision 1.24 / (download) - annotate - [select for diffs], Thu Dec 27 03:25:25 2018 UTC (5 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 (colored)

move client/server SSH-* banners to buffers under ssh->kex and factor
out the banner exchange. This eliminates some common code from the
client and server.

Also be more strict about handling \r characters - these should only
be accepted immediately before \n (pointed out by Jann Horn).

Inspired by a patch from Markus Schmidt.
(lots of) feedback and ok markus@

Revision 1.23 / (download) - annotate - [select for diffs], Thu Sep 13 02:08:33 2018 UTC (5 years, 8 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.22: +11 -6 lines
Diff to previous 1.22 (colored)

hold our collective noses and use the openssl-1.1.x API in OpenSSH;
feedback and ok tb@ jsing@ markus@

Revision 1.22 / (download) - annotate - [select for diffs], Wed Feb 7 02:06:51 2018 UTC (6 years, 3 months ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.21: +3 -5 lines
Diff to previous 1.21 (colored)

Remove all guards for calls to OpenSSL free functions - all of these
functions handle NULL, from at least OpenSSL 1.0.1g onwards.

Prompted by dtucker@ asking about guards for RSA_free(), when looking at
openssh-portable pr#84 on github.

ok deraadt@ dtucker@

Revision 1.21 / (download) - annotate - [select for diffs], Mon Dec 18 02:25:15 2017 UTC (6 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

pass negotiated signing algorithm though to sshkey_verify() and
check that the negotiated algorithm matches the type in the
signature (only matters for RSA SHA1/SHA2 sigs). ok markus@

Revision 1.20 / (download) - annotate - [select for diffs], Tue May 30 14:23:52 2017 UTC (6 years, 11 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.19: +3 -4 lines
Diff to previous 1.19 (colored)

protocol handlers all get struct ssh passed; ok djm@

Revision 1.19 / (download) - annotate - [select for diffs], Mon May 2 10:26:04 2016 UTC (8 years ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.18: +9 -1 lines
Diff to previous 1.18 (colored)

add support for additional fixed DH groups from
draft-ietf-curdle-ssh-kex-sha2-03

diffie-hellman-group14-sha256 (2K group)
diffie-hellman-group16-sha512 (4K group)
diffie-hellman-group18-sha512 (8K group)

based on patch from Mark D. Baushke and Darren Tucker
ok markus@

Revision 1.18 / (download) - annotate - [select for diffs], Mon Jan 26 06:10:03 2015 UTC (9 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.17: +4 -2 lines
Diff to previous 1.17 (colored)

correctly match ECDSA subtype (== curve) for offered/recevied
host keys. Fixes connection-killing host key mismatches when
a server offers multiple ECDSA keys with different curve type
(an extremely unlikely configuration).

ok markus, "looks mechanical" deraadt@

Revision 1.17 / (download) - annotate - [select for diffs], Mon Jan 19 20:16:15 2015 UTC (9 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.16: +120 -74 lines
Diff to previous 1.16 (colored)

adapt kex to sshbuf and struct ssh; ok djm@

Revision 1.16 / (download) - annotate - [select for diffs], Mon Jan 19 19:52:16 2015 UTC (9 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 (colored)

update packet.c & isolate, introduce struct ssh
a) switch packet.c to buffer api and isolate per-connection info into struct ssh
b) (de)serialization of the state is moved from monitor to packet.c
c) the old packet.c API is implemented in opacket.[ch]
d) compress.c/h is removed and integrated into packet.c
with and ok djm@

Revision 1.15 / (download) - annotate - [select for diffs], Sun Feb 2 03:44:31 2014 UTC (10 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.14: +2 -2 lines
Diff to previous 1.14 (colored)

convert memset of potentially-private data to explicit_bzero()

Revision 1.14 / (download) - annotate - [select for diffs], Sun Jan 12 08:13:13 2014 UTC (10 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

avoid use of OpenSSL BIGNUM type and functions for KEX with
Curve25519 by adding a buffer_put_bignum2_from_string() that stores
a string using the bignum encoding rules. Will make it easier to
build a reduced-feature OpenSSH without OpenSSL in the future;
ok markus@

Revision 1.13 / (download) - annotate - [select for diffs], Fri May 17 00:13:13 2013 UTC (11 years ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.12: +4 -4 lines
Diff to previous 1.12 (colored)

bye, bye xfree(); ok markus@

Revision 1.12 / (download) - annotate - [select for diffs], Wed Nov 10 01:33:07 2010 UTC (13 years, 6 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.11: +3 -1 lines
Diff to previous 1.11 (colored)

use only libcrypto APIs that are retained with OPENSSL_NO_DEPRECATED.
these have been around for years by this time. ok markus

Revision 1.2.6.3 / (download) - annotate - [select for diffs], Wed Nov 8 00:44:05 2006 UTC (17 years, 6 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.2.6.2: +7 -4 lines
Diff to previous 1.2.6.2 (colored) to branchpoint 1.2 (colored) next main 1.3 (colored)

upgrade to OpenSSH 4.5

Revision 1.9.4.1 / (download) - annotate - [select for diffs], Wed Nov 8 00:42:10 2006 UTC (17 years, 6 months ago) by brad
Branch: OPENBSD_4_0
Changes since 1.9: +7 -4 lines
Diff to previous 1.9 (colored) next main 1.10 (colored)

upgrade to OpenSSH 4.5

Revision 1.3.2.2 / (download) - annotate - [select for diffs], Wed Nov 8 00:17:14 2006 UTC (17 years, 6 months ago) by brad
Branch: OPENBSD_3_9
Changes since 1.3.2.1: +7 -4 lines
Diff to previous 1.3.2.1 (colored) to branchpoint 1.3 (colored) next main 1.4 (colored)

upgrade to OpenSSH 4.5

Revision 1.11 / (download) - annotate - [select for diffs], Mon Nov 6 21:25:28 2006 UTC (17 years, 6 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7, 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
Changes since 1.10: +3 -2 lines
Diff to previous 1.10 (colored)

add missing checks for openssl return codes; with & ok djm@

Revision 1.10 / (download) - annotate - [select for diffs], Tue Oct 31 16:33:12 2006 UTC (17 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.9: +5 -3 lines
Diff to previous 1.9 (colored)

check DH_compute_key() for -1 even if it should not happen because of
earlier calls to dh_pub_is_valid(); report krahmer at suse.de; ok djm

Revision 1.2.6.2 / (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.2.6.1: +9 -3 lines
Diff to previous 1.2.6.1 (colored) to branchpoint 1.2 (colored)

upgrade to OpenSSH 4.4

Revision 1.3.2.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.3: +9 -3 lines
Diff to previous 1.3 (colored)

upgrade to OpenSSH 4.4

Revision 1.9 / (download) - annotate - [select for diffs], Thu Aug 3 03:34:42 2006 UTC (17 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE
Branch point for: OPENBSD_4_0
Changes since 1.8: +5 -2 lines
Diff to previous 1.8 (colored)

almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step

Revision 1.8 / (download) - annotate - [select for diffs], Tue Aug 1 23:22:47 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.7: +2 -1 lines
Diff to previous 1.7 (colored)

move #include <stdio.h> out of includes.h

Revision 1.7 / (download) - annotate - [select for diffs], Sat Jul 22 20:48:23 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.6: +3 -1 lines
Diff to previous 1.6 (colored)

move #include <string.h> out of includes.h

Revision 1.6 / (download) - annotate - [select for diffs], Thu May 18 21:27:25 2006 UTC (18 years ago) by miod
Branch: MAIN
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

paramter -> parameter

Revision 1.5 / (download) - annotate - [select for diffs], Sat Mar 25 13:17:02 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.4: +1 -0 lines
Diff to previous 1.4 (colored)

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

Revision 1.4 / (download) - annotate - [select for diffs], Sun Mar 19 18:51:18 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.3: +0 -1 lines
Diff to previous 1.3 (colored)

RCSID() can die

Revision 1.2.6.1 / (download) - annotate - [select for diffs], Fri Feb 3 03:01:56 2006 UTC (18 years, 3 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.2: +8 -7 lines
Diff to previous 1.2 (colored)

upgrade to OpenSSH 4.3

Revision 1.2.4.1 / (download) - annotate - [select for diffs], Fri Feb 3 02:53:44 2006 UTC (18 years, 3 months ago) by brad
Branch: OPENBSD_3_7
Changes since 1.2: +8 -7 lines
Diff to previous 1.2 (colored) next main 1.3 (colored)

upgrade to OpenSSH 4.3

Revision 1.3 / (download) - annotate - [select for diffs], Fri Nov 4 05:15:59 2005 UTC (18 years, 6 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE
Branch point for: OPENBSD_3_9
Changes since 1.2: +8 -7 lines
Diff to previous 1.2 (colored)

remove hardcoded hash lengths in key exchange code, allowing
implementation of KEX methods with different hashes (e.g. SHA-256);
ok markus@ dtucker@ stevesk@

Revision 1.1.8.1 / (download) - annotate - [select for diffs], Thu Aug 19 22:37:31 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.1: +11 -2 lines
Diff to previous 1.1 (colored) next main 1.2 (colored)

upgrade to OpenSSH 3.9

Revision 1.1.10.1 / (download) - annotate - [select for diffs], Thu Aug 19 04:13:26 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_5
Changes since 1.1: +11 -2 lines
Diff to previous 1.1 (colored) next main 1.2 (colored)

upgrade to OpenSSH 3.9

Revision 1.2 / (download) - annotate - [select for diffs], Sun Jun 13 12:53:24 2004 UTC (19 years, 11 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE, OPENBSD_3_7_BASE, OPENBSD_3_6_BASE, OPENBSD_3_6
Branch point for: OPENBSD_3_8, OPENBSD_3_7
Changes since 1.1: +11 -2 lines
Diff to previous 1.1 (colored)

implement diffie-hellman-group14-sha1 kex method (trivial extension to
existing diffie-hellman-group1-sha1); ok markus@

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

upgrade to OpenSSH 3.7

Revision 1.1.6.1 / (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.1: +1 -1 lines
Diff to previous 1.1 (colored) next main 1.2 (colored)

Merge OpenSSH 3.6.1

Revision 1.1.4.1 / (download) - annotate - [select for diffs], Tue Apr 1 10:38:57 2003 UTC (21 years, 1 month ago) by margarida
Branch: OPENBSD_3_2
Changes since 1.1: +1 -1 lines
Diff to previous 1.1 (colored)

These were missed on the update to the last openssh.

Thanks to all who pointed it out.

Revision 1.1 / (download) - annotate - [select for diffs], Sun Feb 16 17:09:57 2003 UTC (21 years, 3 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_4_BASE, OPENBSD_3_3_BASE, OPENBSD_3_3
Branch point for: OPENBSD_3_5, OPENBSD_3_4, OPENBSD_3_2, OPENBSD_3_1

split kex into client and server code, no need to link
server code into the client; ok provos@

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.