shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix doc and libgcrypt build

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-04-28 12:48:47 +02:00
parent 904c6ed853
commit 84db436e3b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libssh/auth.c
View File

@@ -378,7 +378,7 @@ error:
* two different logins in a row. * two different logins in a row.
* *
* @param[in] type The type of the public key. This value is given by * @param[in] type The type of the public key. This value is given by
* publickey_from_file(). * publickey_from_file() or ssh_privatekey_type().
* *
* @param[in] publickey A public key returned by publickey_from_file(). * @param[in] publickey A public key returned by publickey_from_file().
* *
@@ -393,6 +393,7 @@ error:
* *
* @see publickey_from_file() * @see publickey_from_file()
* @see privatekey_from_file() * @see privatekey_from_file()
* @see ssh_privatekey_type()
* @see ssh_userauth_pubkey() * @see ssh_userauth_pubkey()
*/ */
int ssh_userauth_offer_pubkey(ssh_session session, const char *username, int ssh_userauth_offer_pubkey(ssh_session session, const char *username,

8
libssh/keyfiles.c
View File

@@ -364,11 +364,11 @@ static ssh_buffer privatekey_file_to_buffer(FILE *fp, int type,
} }
switch(type) { switch(type) {
case TYPE_DSS: case SSH_KEYTYPE_DSS:
header_begin = DSA_HEADER_BEGIN; header_begin = DSA_HEADER_BEGIN;
header_end = DSA_HEADER_END; header_end = DSA_HEADER_END;
break; break;
case TYPE_RSA: case SSH_KEYTYPE_RSA:
header_begin = RSA_HEADER_BEGIN; header_begin = RSA_HEADER_BEGIN;
header_end = RSA_HEADER_END; header_end = RSA_HEADER_END;
break; break;
@@ -468,7 +468,7 @@ static int read_rsa_privatekey(FILE *fp, gcry_sexp_t *r,
ssh_buffer buffer = NULL; ssh_buffer buffer = NULL;
int rc = 1; int rc = 1;
buffer = privatekey_file_to_buffer(fp, TYPE_RSA, cb, userdata, desc); buffer = privatekey_file_to_buffer(fp, SSH_KEYTYPE_RSA, cb, userdata, desc);
if (buffer == NULL) { if (buffer == NULL) {
return 0; return 0;
} }
@@ -537,7 +537,7 @@ static int read_dsa_privatekey(FILE *fp, gcry_sexp_t *r, ssh_auth_callback cb,
ssh_string v = NULL; ssh_string v = NULL;
int rc = 1; int rc = 1;
buffer = privatekey_file_to_buffer(fp, TYPE_DSS, cb, userdata, desc); buffer = privatekey_file_to_buffer(fp, SSH_KEYTYPE_DSS, cb, userdata, desc);
if (buffer == NULL) { if (buffer == NULL) {
return 0; return 0;
} }