src/usr.bin/ssh/sshkey.c - diff - 1.54

Return to sshkey.c CVS log

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

Diff for /src/usr.bin/ssh/sshkey.c between version 1.53 and 1.54

version 1.53, 2017/06/28 01:09:22

version 1.54, 2017/07/01 13:50:45

Line 47

Line 47

#include "ssherr.h"

#include "ssherr.h"

#include "misc.h"

#include "misc.h"

#include "sshbuf.h"

#include "sshbuf.h"

#include "rsa.h"

#include "cipher.h"

#include "cipher.h"

#include "digest.h"

#include "digest.h"

#define SSHKEY_INTERNAL

#define SSHKEY_INTERNAL

Line 2617

Line 2616

(r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||

(r = rsa_generate_additional_parameters(k->rsa)) != 0)

(r = ssh_rsa_generate_additional_parameters(k)) != 0)

goto out;

goto out;

if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {

if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {

r = SSH_ERR_KEY_LENGTH;

r = SSH_ERR_KEY_LENGTH;

Line 2631

Line 2630

(r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||

(r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||

(r = rsa_generate_additional_parameters(k->rsa)) != 0)

(r = ssh_rsa_generate_additional_parameters(k)) != 0)

goto out;

goto out;

if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {

if (BN_num_bits(k->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {

r = SSH_ERR_KEY_LENGTH;

r = SSH_ERR_KEY_LENGTH;