diff options
| author | Jeroen van Meeuwen (OGD) <j.van.meeuwen@ogd.nl> | 2009-12-21 23:26:30 +0100 |
|---|---|---|
| committer | Jeroen van Meeuwen (OGD) <j.van.meeuwen@ogd.nl> | 2009-12-21 23:26:30 +0100 |
| commit | fc47b8a6fe1581ace7232983ec226361ddae1505 (patch) | |
| tree | b1aed2c439f68c98182379d73283bfdd2be33add /ext/openssl/ossl_ssl.c | |
| parent | bd3c1a16630e34f2e6812f352156169558844f7d (diff) | |
| download | ruby-fc47b8a6fe1581ace7232983ec226361ddae1505.tar.gz ruby-fc47b8a6fe1581ace7232983ec226361ddae1505.tar.xz ruby-fc47b8a6fe1581ace7232983ec226361ddae1505.zip | |
OpenSSL-1.0 compatibility
Diffstat (limited to 'ext/openssl/ossl_ssl.c')
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 8e632b526..8fbec57b0 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -89,12 +89,18 @@ static char *ossl_sslctx_attrs[] = { static char *ossl_ssl_attr_readers[] = { "io", "context", }; static char *ossl_ssl_attrs[] = { "sync_close", }; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +#define OSSL_MORE_CONST const +#define STACK _STACK +#else +#define OSSL_MORE_CONST +#endif /* * SSLContext class */ struct { const char *name; - SSL_METHOD *(*func)(void); + OSSL_MORE_CONST SSL_METHOD *(*func)(void); } ossl_ssl_method_tab[] = { #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method } OSSL_SSL_METHOD_ENTRY(TLSv1), @@ -144,7 +150,7 @@ static VALUE ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self) { VALUE ssl_method; - SSL_METHOD *method = NULL; + OSSL_MORE_CONST SSL_METHOD *method = NULL; SSL_CTX *ctx; int i; char *s; @@ -407,7 +413,7 @@ ossl_sslctx_setup(VALUE self) } static VALUE -ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher) +ossl_ssl_cipher_to_ary(OSSL_MORE_CONST SSL_CIPHER *cipher) { VALUE ary; int bits, alg_bits; @@ -805,7 +811,7 @@ static VALUE ossl_ssl_get_cipher(VALUE self) { SSL *ssl; - SSL_CIPHER *cipher; + OSSL_MORE_CONST SSL_CIPHER *cipher; Data_Get_Struct(self, SSL, ssl); if (!ssl) { |