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

Return to dh.c CVS log

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

Diff for /src/usr.bin/ssh/dh.c between version 1.31.8.1 and 1.32

version 1.31.8.1, 2006/09/30 04:06:50

version 1.32, 2006/03/19 02:24:05

Line 1

/* $OpenBSD$ */

Line 23

Line 22

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

#include <sys/param.h>

#include "includes.h"

RCSID("$OpenBSD$");

#include "xmalloc.h"

#include <openssl/bn.h>

#include <openssl/dh.h>

#include <openssl/evp.h>

#include <stdio.h>

#include "buffer.h"

#include <stdlib.h>

#include "cipher.h"

#include <string.h>

#include "kex.h"

#include "dh.h"

#include "pathnames.h"

#include "log.h"

Line 42

Line 44

{

char *cp, *arg;

char *strsize, *gen, *prime;

const char *errstr = NULL;

cp = line;

if ((arg = strdelim(&cp)) == NULL)

Line 67

Line 68

goto fail;

strsize = strsep(&cp, " "); /* size */

if (cp == NULL || *strsize == '\0' ||

(dhg->size = (u_int)strtonum(strsize, 0, 64*1024, &errstr)) == 0 ||

(dhg->size = atoi(strsize)) == 0)

errstr)

goto fail;

/* The whole group is one bit larger */

dhg->size++;

Line 179

int i;

int n = BN_num_bits(dh_pub);

int bits_set = 0;

BIGNUM *tmp;

if (dh_pub->neg) {

logit("invalid public DH value: negativ");

return 0;

}

if (BN_cmp(dh_pub, BN_value_one()) != 1) { /* pub_exp <= 1 */

logit("invalid public DH value: <= 1");

return 0;

}

if ((tmp = BN_new()) == NULL)

return (-1);

if (!BN_sub(tmp, dh->p, BN_value_one()) ||

BN_cmp(dh_pub, tmp) != -1) { /* pub_exp > p-2 */

BN_clear_free(tmp);

logit("invalid public DH value: >= p-1");

return 0;

}

BN_clear_free(tmp);

for (i = 0; i <= n; i++)

if (BN_is_bit_set(dh_pub, i))

bits_set++;

debug2("bits set: %d/%d", bits_set, BN_num_bits(dh->p));

/* if g==2 and bits_set==1 then computing log_g(dh_pub) is trivial */

if (bits_set > 1)

if (bits_set > 1 && (BN_cmp(dh_pub, dh->p) == -1))

return 1;

logit("invalid public DH value (%d/%d)", bits_set, BN_num_bits(dh->p));

return 0;

}