mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-22 10:00:14 +00:00
4c4f05e096
[kex.c kex.h sshconnect2.c sshd.c] generate a 2*need size (~300 instead of 1024/2048) random private exponent during the DH key agreement. according to Niels (the great german advisor) this is safe since /etc/primes contains strong primes only. References: P. C. van Oorschot and M. J. Wiener, On Diffie-Hellman key agreement with short exponents, In Advances in Cryptology - EUROCRYPT'96, LNCS 1070, Springer-Verlag, 1996, pp.332-343.
135 lines
3.5 KiB
C
135 lines
3.5 KiB
C
/* $OpenBSD: kex.h,v 1.15 2001/03/05 17:17:20 markus Exp $ */
|
|
|
|
/*
|
|
* 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
|
|
|
|
#include <openssl/evp.h>
|
|
#include "buffer.h"
|
|
|
|
#define KEX_DH1 "diffie-hellman-group1-sha1"
|
|
#define KEX_DHGEX "diffie-hellman-group-exchange-sha1"
|
|
|
|
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;
|
|
u_char *key;
|
|
u_char *iv;
|
|
};
|
|
struct Mac {
|
|
char *name;
|
|
int enabled;
|
|
EVP_MD *md;
|
|
int mac_len;
|
|
u_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;
|
|
int hostkey_type;
|
|
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, u_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 *);
|
|
void dh_gen_key(DH *, int);
|
|
DH *dh_new_group1(void);
|
|
|
|
u_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);
|
|
|
|
u_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
|