Commit Graph

8739 Commits

Author SHA1 Message Date
markus@openbsd.org
54d90ace1d upstream commit
switch from Key typedef with struct sshkey; ok djm@

Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f
2017-05-31 10:47:31 +10:00
markus@openbsd.org
c221219b1f upstream commit
remove ssh1 references; ok djm@

Upstream-ID: fc23b7578e7b0a8daaec72946d7f5e58ffff5a3d
2017-05-31 10:46:44 +10:00
markus@openbsd.org
afbfa68fa1 upstream commit
revise sshkey_load_public(): remove ssh1 related
comments, remove extra open()/close() on keyfile, prevent leak of 'pub' if
'keyp' is NULL, replace strlcpy+cat with asprintf; ok djm@

Upstream-ID: 6175e47cab5b4794dcd99c1175549a483ec673ca
2017-05-31 10:46:03 +10:00
markus@openbsd.org
813f55336a upstream commit
sshbuf_consume: reset empty buffer; ok djm@

Upstream-ID: 0d4583ba57f69e369d38bbd7843d85cac37fa821
2017-05-27 15:35:52 +10:00
markus@openbsd.org
6cf711752c upstream commit
remove SSH_CHANNEL_XXX_DRAINING (ssh1 only); ok djm@

Upstream-ID: e2e225b6ac67b84dd024f38819afff2554fafe42
2017-05-27 15:35:52 +10:00
markus@openbsd.org
364f0d5ede upstream commit
remove channel_input_close_confirmation (ssh1 only); ok
djm@

Upstream-ID: 8e7c8c38f322d255bb0294a5c0ebef53fdf576f1
2017-05-27 15:35:52 +10:00
djm@openbsd.org
8ba0fd4008 upstream commit
fix references to obsolete v00 cert format; spotted by
Jakub Jelen

Upstream-ID: 7600ce193ab8fd19451acfe24fc2eb39d46b2c4f
2017-05-27 15:35:52 +10:00
Mike Frysinger
dcc714c65c configure: actually set cache vars when cross-compiling
The cross-compiling fallback message says it's assuming the test
passed, but it didn't actually set the cache var which causes
later tests to fail.
2017-05-25 14:34:52 +10:00
djm@openbsd.org
947a3e829a upstream commit
there's no reason to artificially limit the key path
here, just check that it fits PATH_MAX; spotted by Matthew Patton

Upstream-ID: 858addaf2009c9cf04d80164a41b2088edb30b58
2017-05-20 14:30:14 +10:00
djm@openbsd.org
773224802d upstream commit
Now that we no longer support SSHv1, replace the contents
of this file with a pointer to
https://tools.ietf.org/html/draft-miller-ssh-agent-00 It's better edited,
doesn't need to document stuff we no longer implement and does document stuff
that we do implement (RSA SHA256/512 signature flags)

Upstream-ID: da8cdc46bbcc266efabd565ddddd0d8e556f846e
2017-05-20 14:30:14 +10:00
djm@openbsd.org
54cd41a466 upstream commit
allow LogLevel in sshd_config Match blocks; ok dtucker
bz#2717

Upstream-ID: 662e303be63148f47db1aa78ab81c5c2e732baa8
2017-05-17 11:25:22 +10:00
djm@openbsd.org
277abcda3f upstream commit
remove duplicate check; spotted by Jakub Jelen

Upstream-ID: 30c2996c1767616a8fdc49d4cee088efac69c3b0
2017-05-17 11:25:22 +10:00
djm@openbsd.org
adb47ce839 upstream commit
mention that Ed25519 keys are valid as CA keys; spotted
by Jakub Jelen

Upstream-ID: d3f6db58b30418cb1c3058211b893a1ffed3dfd4
2017-05-17 11:25:22 +10:00
Damien Miller
6bdf70f01e clean up regress files and add a .gitignore 2017-05-09 18:41:54 -07:00
djm@openbsd.org
7bdb2eeb1d upstream commit
remove hmac-ripemd160; ok dtucker

Upstream-ID: 896e737ea0bad6e23327d1c127e02d5e9e9c654d
2017-05-10 11:41:21 +10:00
djm@openbsd.org
5f02bb1f99 upstream commit
make requesting bad ECDSA bits yield the same error
(SSH_ERR_KEY_LENGTH) as the same mistake for RSA/DSA

Upstream-ID: bf40d3fee567c271e33f05ef8e4e0fa0b6f0ece6
2017-05-10 11:40:18 +10:00
djm@openbsd.org
d757a4b633 upstream commit
fix for new SSH_ERR_KEY_LENGTH error value

Upstream-Regress-ID: c38a6e6174d4c3feca3518df150d4fbae0dca8dc
2017-05-08 16:11:26 +10:00
djm@openbsd.org
2e58a69508 upstream commit
helps if I commit the correct version of the file. fix
missing return statement.

Upstream-ID: c86394a3beeb1ec6611e659bfa830254f325546c
2017-05-08 16:09:20 +10:00
djm@openbsd.org
effaf526bf upstream commit
remove arcfour, blowfish and CAST here too

Upstream-Regress-ID: c613b3bcbef75df1fe84ca4dc2d3ef253dc5e920
2017-05-08 11:54:17 +10:00
djm@openbsd.org
7461a5bc57 upstream commit
I was too aggressive with the scalpel in the last commit;
unbreak sshd, spotted quickly by naddy@

Upstream-ID: fb7e75d2b2c7e6ca57dee00ca645e322dd49adbf
2017-05-08 10:23:17 +10:00
djm@openbsd.org
bd636f4091 upstream commit
Refuse RSA keys <1024 bits in length. Improve reporting
for keys that do not meet this requirement. ok markus@

Upstream-ID: b385e2a7b13b1484792ee681daaf79e1e203df6c
2017-05-08 09:21:22 +10:00
djm@openbsd.org
70c1218fc4 upstream commit
Don't offer CBC ciphers by default in the client. ok
markus@

Upstream-ID: 94c9ce8d0d1a085052e11c7f3307950fdc0901ef
2017-05-08 09:21:11 +10:00
djm@openbsd.org
acaf34fd82 upstream commit
As promised in last release announcement: remove
support for Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@

Upstream-ID: 21f8facdba3fd8da248df6417000867cec6ba222
2017-05-08 09:21:00 +10:00
naddy@openbsd.org
3e371bd212 upstream commit
more simplification and removal of SSHv1-related code;
ok djm@

Upstream-ID: d2f041aa0b79c0ebd98c68a01e5a0bfab2cf3b55
2017-05-08 09:18:27 +10:00
naddy@openbsd.org
2e9c324b3a upstream commit
remove superfluous protocol 2 mentions; ok jmc@

Upstream-ID: 0aaf7567c9f2e50fac5906b6a500a39c33c4664d
2017-05-08 09:18:27 +10:00
djm@openbsd.org
744bde79c3 upstream commit
since a couple of people have asked, leave a comment
explaining why we retain SSH v.1 support in the "delete all keys from agent"
path.

Upstream-ID: 4b42dcfa339813c15fe9248a2c1b7ed41c21bbb4
2017-05-08 09:18:27 +10:00
djm@openbsd.org
0c378ff6d9 upstream commit
another tentacle: cipher_set_key_string() was only ever
used for SSHv1

Upstream-ID: 7fd31eb6c48946f7e7cc12af0699fe8eb637e94a
2017-05-08 09:18:27 +10:00
naddy@openbsd.org
9a82e24b98 upstream commit
restore mistakenly deleted description of the
ConnectionAttempts option ok markus@

Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348
2017-05-08 09:18:27 +10:00
naddy@openbsd.org
768405fddf upstream commit
remove miscellaneous SSH1 leftovers; ok markus@

Upstream-ID: af23696022ae4d45a1abc2fb8b490d8d9dd63b7c
2017-05-08 09:18:27 +10:00
jmc@openbsd.org
1a1b24f822 upstream commit
more protocol 1 bits removed; ok djm

Upstream-ID: b5b977eaf756915acb56aef3604a650e27f7c2b9
2017-05-08 09:18:05 +10:00
jmc@openbsd.org
2b6f799e9b upstream commit
more protocol 1 stuff to go; ok djm

Upstream-ID: 307a30441d2edda480fd1661d998d36665671e47
2017-05-08 09:18:05 +10:00
jmc@openbsd.org
f10c0d32cd upstream commit
rsa1 is no longer valid;

Upstream-ID: 9953d09ed9841c44b7dcf7019fa874783a709d89
2017-05-08 09:18:05 +10:00
jmc@openbsd.org
42b690b4fd upstream commit
add PubKeyAcceptedKeyTypes to the -o list: scp(1) has
it, so i guess this should too;

Upstream-ID: 7fab32e869ca5831d09ab0c40d210b461d527a2c
2017-05-08 09:18:04 +10:00
jmc@openbsd.org
d852603214 upstream commit
remove now obsolete protocol1 options from the -o
lists;

Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd
2017-05-08 09:18:04 +10:00
jmc@openbsd.org
8b60ce8d81 upstream commit
more -O shuffle; ok djm

Upstream-ID: c239991a3a025cdbb030b73e990188dd9bfbeceb
2017-05-08 09:18:04 +10:00
djm@openbsd.org
3575f0b12a upstream commit
remove -1 / -2 options; pointed out by jmc@

Upstream-ID: 65d2a816000741a95df1c7cfdb5fa8469fcc7daa
2017-05-08 09:18:04 +10:00
jmc@openbsd.org
4f1ca823ba upstream commit
remove options -12 from usage();

Upstream-ID: db7ceef25132e63b50ed05289bf447fece1d1270
2017-05-08 09:18:04 +10:00
jmc@openbsd.org
6b84897f7f upstream commit
tidy up -O somewhat; ok djm

Upstream-ID: 804405f716bf7ef15c1f36ab48581ca16aeb4d52
2017-05-08 09:18:04 +10:00
djm@openbsd.org
d1c6b7fdbd upstream commit
when freeing a bitmap, zero all it bytes; spotted by Ilya
Kaliman

Upstream-ID: 834ac024f2c82389d6ea6b1c7d6701b3836e28e4
2017-05-02 13:39:36 +10:00
djm@openbsd.org
0f16398301 upstream commit
this one I did forget to "cvs rm"

Upstream-ID: 5781670c0578fe89663c9085ed3ba477cf7e7913
2017-05-02 13:39:36 +10:00
djm@openbsd.org
21ed00a8e2 upstream commit
don't know why cvs didn't exterminate these the first
time around, I use rm -f and everuthing...

pointed out by sobrado@

Upstream-ID: a6c44a0c2885330d322ee01fcfd7f6f209b1e15d
2017-05-02 13:39:36 +10:00
Darren Tucker
d29ba6f450 Define INT32_MAX and INT64_MAX if needed. 2017-05-01 13:53:55 +10:00
Darren Tucker
329037e389 Wrap stdint.h in HAVE_STDINT_H 2017-05-01 13:53:55 +10:00
djm@openbsd.org
f382362e8d upstream commit
remove unused variable

Upstream-ID: 66011f00819d0e71b14700449a98414033284516
2017-05-01 12:28:06 +10:00
djm@openbsd.org
dd369320d2 upstream commit
eliminate explicit specification of protocol in tests and
loops over protocol. We only support SSHv2 now.

Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd
2017-05-01 11:59:42 +10:00
djm@openbsd.org
557f921aad upstream commit
remove SSHv1 support from unit tests

Upstream-Regress-ID: 395ca2aa48f1f7d23eefff6cb849ea733ca8bbfe
2017-05-01 10:07:19 +10:00
djm@openbsd.org
e77e156271 upstream commit
fixup setting ciphercontext->plaintext (lost in SSHv1 purge),
though it isn't really used for much anymore.

Upstream-ID: 859b8bce84ff4865b32097db5430349d04b9b747
2017-05-01 10:06:24 +10:00
Damien Miller
f7849e6c83 remove configure --with-ssh1 2017-05-01 10:05:07 +10:00
djm@openbsd.org
f4a6a88ddb upstream commit
flense SSHv1 support from ssh-agent, considerably
simplifying it

ok markus

Upstream-ID: 71d772cdcefcb29f76e01252e8361e6fc2dfc365
2017-05-01 10:05:07 +10:00
djm@openbsd.org
930e8d2827 upstream commit
obliterate ssh1.h and some dead code that used it

ok markus@

Upstream-ID: 1ca9159a9fb95618f9d51e069ac8e1131a087343
2017-05-01 10:05:06 +10:00