proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-26 03:42:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ssl: remove GnuTLS support

Browse Source 
It's too much work for now to redo everything.

Move the ssl context struct to transport.h
This commit is contained in:
Carlos Martín Nieto 2012-05-17 21:40:20 +02:00
parent 16768191c7
commit d3e1367f61
4 changed files with 28 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -88,18 +88,9 @@ ENDIF ()
FIND_PACKAGE(OpenSSL)
IF (OPENSSL_FOUND)
ADD_DEFINITIONS(-DGIT_OPENSSL)
ADD_DEFINITIONS(-DGIT_SSL)
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
ELSE()
FIND_PACKAGE(GnuTLS)
IF (GNUTLS_FOUND)
INCLUDE_DIRECTORIES(GNUTLS_INCLUDE_DIR)
ADD_DEFINITIONS(-DGIT_GNUTLS)
ADD_DEFINITIONS(-DGIT_SSL)
SET(SSL_LIBRARIES ${GNUTLS_LIBRARIES})
ENDIF()
ENDIF()
IF (THREADSAFE)

19
src/common.h
View File

@ -20,13 +20,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#ifdef GIT_GNUTLS
# include <gnutls/gnutls.h>
#elif defined(GIT_OPENSSL)
# include <openssl/ssl.h>
# include <openssl/err.h>
#endif
#ifdef GIT_WIN32
# include <io.h>
@ -72,18 +65,6 @@ void giterr_clear(void);
void giterr_set_str(int error_class, const char *string);
void giterr_set_regex(const regex_t *regex, int error_code);
#ifdef GIT_GNUTLS
typedef struct gitno_ssl {
gnutls_session_t session;
gnutls_certificate_credentials_t cred;
} gitno_ssl;
#elif defined(GIT_OPENSSL)
typedef struct gitno_ssl {
SSL_CTX *ctx;
SSL *ssl;
} gitno_ssl;
#endif
#include "util.h"

109
src/netops.c
View File

@ -18,11 +18,7 @@
# endif
#endif
#ifdef GIT_GNUTLS
# include <gnutls/openssl.h>
# include <gnutls/gnutls.h>
# include <gnutls/x509.h>
#elif defined(GIT_OPENSSL)
#ifdef GIT_SSL
# include <openssl/ssl.h>
# include <openssl/x509v3.h>
#endif
@ -55,13 +51,7 @@ static void net_set_error(const char *str)
}
#endif
#ifdef GIT_GNUTLS
static int ssl_set_error(int error)
{
giterr_set(GITERR_NET, "SSL error: (%s) %s", gnutls_strerror_name(error), gnutls_strerror(error));
return -1;
}
#elif GIT_OPENSSL
#ifdef GIT_SSL
static int ssl_set_error(gitno_ssl *ssl, int error)
{
int err;
@ -85,23 +75,7 @@ void gitno_buffer_setup(git_transport *t, gitno_buffer *buf, char *data, unsigne
#endif
}
#ifdef GIT_GNUTLS
static int ssl_recv(gitno_ssl *ssl, void *data, size_t len)
{
int ret;
do {
ret = gnutls_record_recv(ssl->session, data, len);
} while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
if (ret < 0) {
ssl_set_error(ret);
return -1;
}
return ret;
}
#elif defined(GIT_OPENSSL)
#ifdef GIT_SSL
static int ssl_recv(gitno_ssl *ssl, void *data, size_t len)
{
int ret;
@ -174,11 +148,7 @@ int gitno_ssl_teardown(git_transport *t)
if (!t->encrypt)
return 0;
#ifdef GIT_GNUTLS
gnutls_deinit(t->ssl.session);
gnutls_certificate_free_credentials(t->ssl.cred);
gnutls_global_deinit();
#elif defined(GIT_OPENSSL)
#ifdef GIT_SSL
do {
ret = SSL_shutdown(t->ssl.ssl);
@ -193,7 +163,7 @@ int gitno_ssl_teardown(git_transport *t)
}
#ifdef GIT_OPENSSL
#ifdef GIT_SSL
/* Match host names according to RFC 2818 rules */
static int match_host(const char *pattern, const char *host)
{
@ -294,44 +264,9 @@ static int verify_server_cert(git_transport *t, const char *host)
return 0;
}
#endif
static int ssl_setup(git_transport *t, const char *host)
{
#ifdef GIT_GNUTLS
int ret;
if ((ret = gnutls_global_init()) < 0)
return ssl_set_error(ret);
if ((ret = gnutls_certificate_allocate_credentials(&t->ssl.cred)) < 0)
return ssl_set_error(ret);
gnutls_init(&t->ssl.session, GNUTLS_CLIENT);
//gnutls_certificate_set_verify_function(ssl->cred, SSL_VERIFY_NONE);
gnutls_credentials_set(t->ssl.session, GNUTLS_CRD_CERTIFICATE, t->ssl.cred);
if ((ret = gnutls_priority_set_direct (t->ssl.session, "NORMAL", NULL)) < 0)
return ssl_set_error(ret);
gnutls_transport_set_ptr(t->ssl.session, (gnutls_transport_ptr_t) t->socket);
do {
ret = gnutls_handshake(t->ssl.session);
} while (ret < 0 && !gnutls_error_is_fatal(ret));
if (ret < 0) {
ssl_set_error(ret);
goto on_error;
}
return 0;
on_error:
gnutls_deinit(t->ssl.session);
gnutls_global_deinit();
return -1;
#elif defined(GIT_OPENSSL)
int ret;
SSL_library_init();
@ -359,11 +294,16 @@ on_error:
return -1;
return 0;
#else
GIT_UNUSED(t);
return 0;
#endif
}
#else
static int ssl_setup(git_transport *t, const char *host)
{
GIT_UNUSED(t);
GIT_UNUSED(host);
return 0;
}
#endif
int gitno_connect(git_transport *t, const char *host, const char *port)
{
struct addrinfo *info = NULL, *p;
@ -410,26 +350,7 @@ int gitno_connect(git_transport *t, const char *host, const char *port)
return 0;
}
#ifdef GIT_GNUTLS
static int send_ssl(gitno_ssl *ssl, const char *msg, size_t len)
{
int ret;
size_t off = 0;
while (off < len) {
ret = gnutls_record_send(ssl->session, msg + off, len - off);
if (ret < 0) {
if (gnutls_error_is_fatal(ret))
return ssl_set_error(ret);
ret = 0;
}
off += ret;
}
return off;
}
#elif defined(GIT_OPENSSL)
#ifdef GIT_SSL
static int send_ssl(gitno_ssl *ssl, const char *msg, size_t len)
{
int ret;

13
src/transport.h
View File

@ -12,6 +12,11 @@
#include "vector.h"
#include "posix.h"
#include "common.h"
#ifdef GIT_SSL
# include <openssl/ssl.h>
# include <openssl/err.h>
#endif
#define GIT_CAP_OFS_DELTA "ofs-delta"
@ -20,6 +25,14 @@ typedef struct git_transport_caps {
ofs_delta:1;
} git_transport_caps;
#ifdef GIT_SSL
typedef struct gitno_ssl {
SSL_CTX *ctx;
SSL *ssl;
} gitno_ssl;
#endif
/*
* A day in the life of a network operation
* ========================================