diff options
author | Damien Miller <djm@mindrot.org> | 2014-07-02 15:28:02 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-07-02 15:28:02 +1000 |
commit | 8668706d0f52654fe64c0ca41a96113aeab8d2b8 (patch) | |
tree | 73e78e1ea3d39206e39870bbe0af17d6c430fb51 /sshconnect2.c | |
parent | 2cd7929250cf9e9f658d70dcd452f529ba08c942 (diff) |
- djm@cvs.openbsd.org 2014/06/24 01:13:21
[Makefile.in auth-bsdauth.c auth-chall.c auth-options.c auth-rsa.c
[auth2-none.c auth2-pubkey.c authfile.c authfile.h cipher-3des1.c
[cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h
[digest-libc.c digest-openssl.c digest.h dns.c entropy.c hmac.h
[hostfile.c key.c key.h krl.c monitor.c packet.c rsa.c rsa.h
[ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c
[ssh-keygen.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c
[ssh-rsa.c sshbuf-misc.c sshbuf.h sshconnect.c sshconnect1.c
[sshconnect2.c sshd.c sshkey.c sshkey.h
[openbsd-compat/openssl-compat.c openbsd-compat/openssl-compat.h]
New key API: refactor key-related functions to be more library-like,
existing API is offered as a set of wrappers.
with and ok markus@
Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
Dempsky and Ron Bowes for a detailed review a few months ago.
NB. This commit also removes portable OpenSSH support for OpenSSL
<0.9.8e.
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 658398436..eb1b0ae3c 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.208 2014/06/05 22:17:50 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.209 2014/06/24 01:13:21 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -970,7 +970,7 @@ identity_sign(Identity *id, u_char **sigp, u_int *lenp, | |||
970 | * we have already loaded the private key or | 970 | * we have already loaded the private key or |
971 | * the private key is stored in external hardware | 971 | * the private key is stored in external hardware |
972 | */ | 972 | */ |
973 | if (id->isprivate || (id->key->flags & KEY_FLAG_EXT)) | 973 | if (id->isprivate || (id->key->flags & SSHKEY_FLAG_EXT)) |
974 | return (key_sign(id->key, sigp, lenp, data, datalen)); | 974 | return (key_sign(id->key, sigp, lenp, data, datalen)); |
975 | /* load the private key from the file */ | 975 | /* load the private key from the file */ |
976 | if ((prv = load_identity_file(id->filename, id->userprovided)) == NULL) | 976 | if ((prv = load_identity_file(id->filename, id->userprovided)) == NULL) |
@@ -1178,12 +1178,12 @@ pubkey_prepare(Authctxt *authctxt) | |||
1178 | } | 1178 | } |
1179 | /* Prefer PKCS11 keys that are explicitly listed */ | 1179 | /* Prefer PKCS11 keys that are explicitly listed */ |
1180 | TAILQ_FOREACH_SAFE(id, &files, next, tmp) { | 1180 | TAILQ_FOREACH_SAFE(id, &files, next, tmp) { |
1181 | if (id->key == NULL || (id->key->flags & KEY_FLAG_EXT) == 0) | 1181 | if (id->key == NULL || (id->key->flags & SSHKEY_FLAG_EXT) == 0) |
1182 | continue; | 1182 | continue; |
1183 | found = 0; | 1183 | found = 0; |
1184 | TAILQ_FOREACH(id2, &files, next) { | 1184 | TAILQ_FOREACH(id2, &files, next) { |
1185 | if (id2->key == NULL || | 1185 | if (id2->key == NULL || |
1186 | (id2->key->flags & KEY_FLAG_EXT) == 0) | 1186 | (id2->key->flags & SSHKEY_FLAG_EXT) == 0) |
1187 | continue; | 1187 | continue; |
1188 | if (key_equal(id->key, id2->key)) { | 1188 | if (key_equal(id->key, id2->key)) { |
1189 | TAILQ_REMOVE(&files, id, next); | 1189 | TAILQ_REMOVE(&files, id, next); |