Fix to build against OpenSSL 1.1, plus siginfo_t for recent Linux

diff --git a/libratbox/src/openssl.c b/libratbox/src/openssl.c
index 86df0b5d5511d8955a16bb8bdc1de9202ac31c11..7a1a6cc88324b1a0ff1300af6695b8d3a3c3863e 100644 (file)
--- a/libratbox/src/openssl.c
+++ b/libratbox/src/openssl.c
@@ -572,10 +572,6 @@ rb_init_prng(const char *path, prng_seed_t seed_type)
 
        switch (seed_type)
        {
-       case RB_PRNG_EGD:
-               if(RAND_egd(path) == -1)
-                       return -1;
-               break;
        case RB_PRNG_FILE:
                if(RAND_load_file(path, -1) == -1)
                        return -1;
@@ -639,8 +635,10 @@ rb_get_ssl_certfp(rb_fde_t *F, uint8_t certfp[RB_SSL_CERTFP_LEN])
                                res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
                                res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
                {
-                       memcpy(certfp, cert->sha1_hash, RB_SSL_CERTFP_LEN);
-                       return 1;
+                       int hashlen = RB_SSL_CERTFP_LEN;
+                       if(ASN1_item_digest(ASN1_ITEM_rptr(X509), EVP_sha1(), cert, certfp, &hashlen) != 1) {
+                               return 0;
+                       }
                }
                X509_free(cert);
        }

diff --git a/libratbox/src/sigio.c b/libratbox/src/sigio.c
index 085b7a4dc3a140118fccad1b31602f574414fc72..5de1127340f7fab46b219fbd87d974cbd849983e 100644 (file)
--- a/libratbox/src/sigio.c
+++ b/libratbox/src/sigio.c
@@ -235,7 +235,7 @@ rb_select_sigio(long delay)
        PF *hdl;
        rb_fde_t *F;
        void *data;
-       struct siginfo si;
+       siginfo_t si;
 
        struct timespec timeout;
        if(rb_sigio_supports_event() || delay >= 0)