src/usr.bin/ssh/kexdhc.c - diff

Return to kexdhc.c CVS log

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

Diff for /src/usr.bin/ssh/Attic/kexdhc.c between version 1.2.6.3 and 1.3

version 1.2.6.3, 2006/11/08 00:44:05

version 1.3, 2005/11/04 05:15:59

Line 1

/* $OpenBSD$ */

Line 23

Line 22

* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <sys/types.h>

#include "includes.h"

RCSID("$OpenBSD$");

#include <stdio.h>

#include <string.h>

#include <signal.h>

#include "xmalloc.h"

#include "buffer.h"

#include "key.h"

#include "cipher.h"

#include "kex.h"

#include "log.h"

#include "packet.h"

Line 47

Line 41

Key *server_host_key;

u_char *server_host_key_blob = NULL, *signature = NULL;

u_char *kbuf, *hash;

u_int klen, slen, sbloblen, hashlen;

u_int klen, kout, slen, sbloblen, hashlen;

int kout;

/* generate and send 'e', client DH public key */

switch (kex->kex_type) {

Line 89

Line 82

if (kex->verify_host_key(server_host_key) == -1)

fatal("server_host_key verification failed");

/* DH parameter f, server public DH key */

/* DH paramter f, server public DH key */

if ((dh_server_pub = BN_new()) == NULL)

fatal("dh_server_pub == NULL");

packet_get_bignum2(dh_server_pub);

Line 110

Line 103

klen = DH_size(dh);

kbuf = xmalloc(klen);

if ((kout = DH_compute_key(kbuf, dh_server_pub, dh)) < 0)

kout = DH_compute_key(kbuf, dh_server_pub, dh);

fatal("DH_compute_key: failed");

#ifdef DEBUG_KEXDH

dump_digest("shared secret", kbuf, kout);

#endif

if ((shared_secret = BN_new()) == NULL)

fatal("kexdh_client: BN_new failed");

if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)

BN_bin2bn(kbuf, kout, shared_secret);

fatal("kexdh_client: BN_bin2bn failed");

memset(kbuf, 0, klen);

xfree(kbuf);