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

Return to authfile.c CVS log

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

Diff for /src/usr.bin/ssh/authfile.c between version 1.50.2.2 and 1.51

version 1.50.2.2, 2003/09/16 21:20:24

version 1.51, 2002/11/15 10:03:09

Line 421

rsa_generate_additional_parameters(prv->rsa);

buffer_free(&decrypted);

/* enable blinding */

if (RSA_blinding_on(prv->rsa, NULL) != 1) {

error("key_load_private_rsa1: RSA_blinding_on failed");

goto fail;

}

close(fd);

return prv;

Line 466

Line 460

#ifdef DEBUG_PK

RSA_print_fp(stderr, prv->rsa, 8);

#endif

if (RSA_blinding_on(prv->rsa, NULL) != 1) {

error("key_load_private_pem: RSA_blinding_on failed");

key_free(prv);

prv = NULL;

}

} else if (pk->type == EVP_PKEY_DSA &&

(type == KEY_UNSPEC||type==KEY_DSA)) {

prv = key_new(KEY_UNSPEC);

Line 511

Line 500

error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @");

error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");

error("Permissions 0%3.3o for '%s' are too open.",

(u_int)st.st_mode & 0777, filename);

st.st_mode & 0777, filename);

error("It is recommended that your private key files are NOT accessible by others.");

error("This private key will be ignored.");

return 0;

Line 626

Line 615

Key *pub;

char file[MAXPATHLEN];

/* try rsa1 private key */

pub = key_load_public_type(KEY_RSA1, filename, commentp);

if (pub != NULL)

return pub;

/* try rsa1 public key */

pub = key_new(KEY_RSA1);

if (key_try_load_public(pub, filename, commentp) == 1)

return pub;

key_free(pub);

/* try ssh2 public key */

pub = key_new(KEY_UNSPEC);

if (key_try_load_public(pub, filename, commentp) == 1)

return pub;