proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-23 14:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ssh: provide our own types for host key lengths

Browse Source 
Instead of using the libssh2 defines, provide our own, which eases usage
as we do not need to check whether libgit2 was built with libssh2 or not.
This commit is contained in:
Carlos Martín Nieto 2014-09-16 02:27:16 +02:00
parent ebda097076
commit 286369a81f
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/git2/transport.h
View File

@ -20,6 +20,16 @@
*/
GIT_BEGIN_DECL
/**
* Type of SSH host fingerprint
*/
typedef enum {
/** MD5, 16 bytes */
GIT_CERT_SSH_MD5,
/** SHA-1, 20 bytes */
GIT_CERT_SSH_SHA1,
} git_cert_ssh_type ;
/**
* Hostkey information taken from libssh2
*/
@ -31,9 +41,9 @@ typedef struct {
git_cert_t cert_type;
/**
* A hostkey type from libssh2, either
* `LIBSSH2_HOSTKEY_HASH_MD5` or `LIBSSH2_HOSTKEY_HASH_SHA1`
* `GIT_CERT_SSH_MD5` or `GIT_CERT_SSH_SHA1`
*/
int type;
git_cert_ssh_type type;
/**
* Hostkey hash. If the type is MD5, only the first 16 bytes
* will be set.

16
src/transports/ssh.c
View File

@ -480,23 +480,21 @@ static int _git_ssh_setup_conn(
goto on_error;
if (t->owner->certificate_check_cb != NULL) {
git_cert_hostkey cert;
git_cert_hostkey cert = { 0 };
const char *key;
size_t certlen;
cert.cert_type = GIT_CERT_HOSTKEY_LIBSSH2;
cert.type = LIBSSH2_HOSTKEY_HASH_SHA1;
key = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_SHA1);
if (key != NULL) {
certlen = 20;
memcpy(&cert.hash, key, certlen);
cert.type = GIT_CERT_SSH_SHA1;
memcpy(&cert.hash, key, 20);
} else {
cert.type = LIBSSH2_HOSTKEY_HASH_MD5;
key = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_MD5);
certlen = 16;
if (key != NULL)
memcpy(&cert.hash, key, certlen);
if (key != NULL) {
cert.type = GIT_CERT_SSH_MD5;
memcpy(&cert.hash, key, 16);
}
}
if (key == NULL) {

2
tests/online/clone.c
View File

@ -492,6 +492,8 @@ int ssh_certificate_check(git_cert *cert, int valid, void *payload)
key = (git_cert_hostkey *) cert;
git_oid_fromraw(&actual, key->hash);
cl_assert_equal_i(GIT_CERT_SSH_SHA1, key->type);
cl_assert(git_oid_equal(&expected, &actual));
return GIT_EUSER;