mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-23 22:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[spice] initial GnuTLS implementation (incomplete)

Browse source
This commit is contained in:
Geoffrey McRae 2018-05-22 09:49:35 +10:00
parent cba6630aa0
commit ceac6a60e6
2 changed files with 71 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/Makefile
View file

@ -8,6 +8,13 @@ LDFLAGS += -Wl,--gc-sections
CFLAGS += -Wfatal-errors CFLAGS += -Wfatal-errors
LIBS = sdl2 SDL2_ttf gl glu libssl openssl spice-protocol fontconfig x11 libconfig LIBS = sdl2 SDL2_ttf gl glu libssl openssl spice-protocol fontconfig x11 libconfig
#LIBS += gnutls
#CFLAGS += -D USE_GNUTLS
LIBS += libssl openssl
CFLAGS += -D USE_OPENSSL
CFLAGS += $(shell pkg-config --cflags $(LIBS)) CFLAGS += $(shell pkg-config --cflags $(LIBS))
LDFLAGS += $(shell pkg-config --libs $(LIBS)) LDFLAGS += $(shell pkg-config --libs $(LIBS))
BUILD ?= .build BUILD ?= .build

64
client/spice/rsa.c
View file

@ -23,12 +23,26 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <spice/protocol.h> #include <spice/protocol.h>
#include <string.h> #include <string.h>
#if defined(USE_OPENSSL) && defined(USE_GNUTLS)
#error "USE_OPENSSL and USE_GNUTLS are both defined"
#elif !defined(USE_OPENSSL) && !defined(USE_GNUTLS)
#error "One of USE_OPENSSL or USE_GNUTLS must be defined"
#endif
#if defined(USE_OPENSSL)
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#endif
#if defined(USE_GNUTLS)
#include <gnutls/gnutls.h>
#include <gnutls/abstract.h>
#endif
bool spice_rsa_encrypt_password(uint8_t * pub_key, char * password, struct spice_password * result) bool spice_rsa_encrypt_password(uint8_t * pub_key, char * password, struct spice_password * result)
{ {
#if defined(USE_OPENSSL)
BIO *bioKey = BIO_new(BIO_s_mem()); BIO *bioKey = BIO_new(BIO_s_mem());
if (!bioKey) if (!bioKey)
{ {
@ -64,11 +78,61 @@ bool spice_rsa_encrypt_password(uint8_t * pub_key, char * password, struct spice
EVP_PKEY_free(rsaKey); EVP_PKEY_free(rsaKey);
BIO_free(bioKey); BIO_free(bioKey);
return true; return true;
#endif
#if defined(USE_GNUTLS)
const gnutls_datum_t pubData =
{
.data = (void *)reply.pub_key,
.size = SPICE_TICKET_PUBKEY_BYTES
};
gnutls_pubkey_t pubkey;
if (gnutls_pubkey_init(&pubkey) < 0)
{
DEBUG_ERROR("gnutls_pubkey_init failed");
return false;
}
if (gnutls_pubkey_import(pubkey, &pubData, GNUTLS_X509_FMT_DER) < 0)
{
gnutls_pubkey_deinit(pubkey);
DEBUG_ERROR("gnutls_pubkey_import failed");
return false;
}
const gnutls_datum_t input =
{
.data = (void *)spice.password,
.size = strlen(spice.password) + 1
};
gnutls_datum_t out;
if (gnutls_pubkey_encrypt_data(pubkey, 0, &input, &out) < 0)
{
gnutls_pubkey_deinit(pubkey);
DEBUG_ERROR("gnutls_pubkey_encrypt_data failed");
return false;
}
result->size = out.size;
result->data = out.data;
gnutls_pubkey_deinit(pubkey);
return true;
#endif
} }
void spice_rsa_free_password(struct spice_password * pass) void spice_rsa_free_password(struct spice_password * pass)
{ {
#if defined(USE_OPENSSL)
free(pass->data); free(pass->data);
#endif
#if defined(USE_GNUTLS)
gnutls_free(pass->data);
#endif
pass->size = 0; pass->size = 0;
pass->data = NULL; pass->data = NULL;
} }