1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- a/spice-common/common/ssl_verify.c
+++ b/spice-common/common/ssl_verify.c
@@ -33,12 +33,10 @@
#include <string.h>
#include <gio/gio.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000
static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
{
return M_ASN1_STRING_data(asn1);
}
-#endif
static int verify_pubkey(X509* cert, const char *key, size_t key_size)
{
--- a/src/bio-gio.c
+++ b/src/bio-gio.c
@@ -23,7 +23,6 @@
#include "spice-util.h"
#include "bio-gio.h"
-#if OPENSSL_VERSION_NUMBER < 0x10100000
static BIO_METHOD one_static_bio;
static int BIO_meth_set_read(BIO_METHOD *biom,
@@ -89,8 +88,6 @@
static void BIO_meth_free(BIO_METHOD *biom)
{
}
-
-#endif
static long bio_gio_ctrl(G_GNUC_UNUSED BIO *b,
int cmd,
--- a/src/spice-channel.c
+++ b/src/spice-channel.c
@@ -55,7 +55,6 @@
static void spice_channel_send_migration_handshake(SpiceChannel *channel);
static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
-#if OPENSSL_VERSION_NUMBER < 0x10100000
static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
{
if (pkey->type != EVP_PKEY_RSA) {
@@ -63,7 +62,7 @@
}
return pkey->pkey.rsa;
}
-#endif
+
/**
* SECTION:spice-channel
* @short_description: the base channel class
|
