mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-23 18:23:25 +08:00
874d77bb13
- markus@cvs.openbsd.org 2000/09/30 10:27:44 [log.c] allow loglevel debug - markus@cvs.openbsd.org 2000/10/03 11:59:57 [packet.c] hmac->mac - markus@cvs.openbsd.org 2000/10/03 12:03:03 [auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c] move fake-auth from auth1.c to individual auth methods, disables s/key in debug-msg - markus@cvs.openbsd.org 2000/10/03 12:16:48 ssh.c do not resolve canonname, i have no idea why this was added oin ossh - markus@cvs.openbsd.org 2000/10/09 15:30:44 ssh-keygen.1 ssh-keygen.c -X now reads private ssh.com DSA keys, too. - markus@cvs.openbsd.org 2000/10/09 15:32:34 auth-options.c clear options on every call. - markus@cvs.openbsd.org 2000/10/09 15:51:00 authfd.c authfd.h interop with ssh-agent2, from <res@shore.net> - markus@cvs.openbsd.org 2000/10/10 14:20:45 compat.c use rexexp for version string matching - provos@cvs.openbsd.org 2000/10/10 22:02:18 [kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h] First rough implementation of the diffie-hellman group exchange. The client can ask the server for bigger groups to perform the diffie-hellman in, thus increasing the attack complexity when using ciphers with longer keys. University of Windsor provided network, T the company. - markus@cvs.openbsd.org 2000/10/11 13:59:52 [auth-rsa.c auth2.c] clear auth options unless auth sucessfull - markus@cvs.openbsd.org 2000/10/11 14:00:27 [auth-options.h] clear auth options unless auth sucessfull - markus@cvs.openbsd.org 2000/10/11 14:03:27 [scp.1 scp.c] support 'scp -o' with help from mouring@pconline.com - markus@cvs.openbsd.org 2000/10/11 14:11:35 [dh.c] Wall - markus@cvs.openbsd.org 2000/10/11 14:14:40 [auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h] [ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h] add support for s/key (kbd-interactive) to ssh2, based on work by mkiernan@avantgo.com and me - markus@cvs.openbsd.org 2000/10/11 14:27:24 [auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h] [myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c] [sshconnect2.c sshd.c] new cipher framework - markus@cvs.openbsd.org 2000/10/11 14:45:21 [cipher.c] remove DES - markus@cvs.openbsd.org 2000/10/12 03:59:20 [cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c] enable DES in SSH-1 clients only - markus@cvs.openbsd.org 2000/10/12 08:21:13 [kex.h packet.c] remove unused - markus@cvs.openbsd.org 2000/10/13 12:34:46 [sshd.c] Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se - markus@cvs.openbsd.org 2000/10/13 12:59:15 [cipher.c cipher.h myproposal.h rijndael.c rijndael.h] rijndael/aes support - markus@cvs.openbsd.org 2000/10/13 13:10:54 [sshd.8] more info about -V - markus@cvs.openbsd.org 2000/10/13 13:12:02 [myproposal.h] prefer no compression
130 lines
3.5 KiB
C
130 lines
3.5 KiB
C
/*
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#ifndef KEX_H
|
|
#define KEX_H
|
|
|
|
#define KEX_DH1 "diffie-hellman-group1-sha1"
|
|
#define KEX_DHGEX "diffie-hellman-group-exchange-sha1"
|
|
#define KEX_DSS "ssh-dss"
|
|
|
|
enum kex_init_proposals {
|
|
PROPOSAL_KEX_ALGS,
|
|
PROPOSAL_SERVER_HOST_KEY_ALGS,
|
|
PROPOSAL_ENC_ALGS_CTOS,
|
|
PROPOSAL_ENC_ALGS_STOC,
|
|
PROPOSAL_MAC_ALGS_CTOS,
|
|
PROPOSAL_MAC_ALGS_STOC,
|
|
PROPOSAL_COMP_ALGS_CTOS,
|
|
PROPOSAL_COMP_ALGS_STOC,
|
|
PROPOSAL_LANG_CTOS,
|
|
PROPOSAL_LANG_STOC,
|
|
PROPOSAL_MAX
|
|
};
|
|
|
|
enum kex_modes {
|
|
MODE_IN,
|
|
MODE_OUT,
|
|
MODE_MAX
|
|
};
|
|
|
|
enum kex_exchange {
|
|
DH_GRP1_SHA1,
|
|
DH_GEX_SHA1
|
|
};
|
|
|
|
typedef struct Kex Kex;
|
|
typedef struct Mac Mac;
|
|
typedef struct Comp Comp;
|
|
typedef struct Enc Enc;
|
|
|
|
struct Enc {
|
|
char *name;
|
|
Cipher *cipher;
|
|
int enabled;
|
|
unsigned char *key;
|
|
unsigned char *iv;
|
|
};
|
|
struct Mac {
|
|
char *name;
|
|
int enabled;
|
|
EVP_MD *md;
|
|
int mac_len;
|
|
unsigned char *key;
|
|
int key_len;
|
|
};
|
|
struct Comp {
|
|
int type;
|
|
int enabled;
|
|
char *name;
|
|
};
|
|
struct Kex {
|
|
Enc enc [MODE_MAX];
|
|
Mac mac [MODE_MAX];
|
|
Comp comp[MODE_MAX];
|
|
int we_need;
|
|
int server;
|
|
char *name;
|
|
char *hostkeyalg;
|
|
int kex_type;
|
|
};
|
|
|
|
Buffer *kex_init(char *myproposal[PROPOSAL_MAX]);
|
|
void
|
|
kex_exchange_kexinit(
|
|
Buffer *my_kexinit, Buffer *peer_kexint,
|
|
char *peer_proposal[PROPOSAL_MAX]);
|
|
Kex *
|
|
kex_choose_conf(char *cprop[PROPOSAL_MAX],
|
|
char *sprop[PROPOSAL_MAX], int server);
|
|
int kex_derive_keys(Kex *k, unsigned char *hash, BIGNUM *shared_secret);
|
|
void packet_set_kex(Kex *k);
|
|
int dh_pub_is_valid(DH *dh, BIGNUM *dh_pub);
|
|
DH *dh_new_group_asc(const char *, const char *);
|
|
DH *dh_new_group(BIGNUM *, BIGNUM *);
|
|
DH *dh_new_group1();
|
|
|
|
unsigned char *
|
|
kex_hash(
|
|
char *client_version_string,
|
|
char *server_version_string,
|
|
char *ckexinit, int ckexinitlen,
|
|
char *skexinit, int skexinitlen,
|
|
char *serverhostkeyblob, int sbloblen,
|
|
BIGNUM *client_dh_pub,
|
|
BIGNUM *server_dh_pub,
|
|
BIGNUM *shared_secret);
|
|
|
|
unsigned char *
|
|
kex_hash_gex(
|
|
char *client_version_string,
|
|
char *server_version_string,
|
|
char *ckexinit, int ckexinitlen,
|
|
char *skexinit, int skexinitlen,
|
|
char *serverhostkeyblob, int sbloblen,
|
|
int minbits, BIGNUM *prime, BIGNUM *gen,
|
|
BIGNUM *client_dh_pub,
|
|
BIGNUM *server_dh_pub,
|
|
BIGNUM *shared_secret);
|
|
#endif
|