OpenSSL 3.0 compatibility

[solanum.git] / librb / src / openssl.c

diff --git a/librb/src/openssl.c b/librb/src/openssl.c
index 6c5a9fbf18c88a8e948a3d6f82075857a540b5f5..e7487ac163249a2c2624cca99435487c434513ef 100644 (file)
--- a/librb/src/openssl.c
+++ b/librb/src/openssl.c
@@ -392,27 +392,48 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
        }
        else
        {
-               FILE *const dhf = fopen(dhfile, "r");
+               BIO *const dhf = BIO_new_file(dhfile, "r");
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+               EVP_PKEY *dhp = NULL;
+#else
                DH *dhp = NULL;
+#endif
 
                if(dhf == NULL)
                {
-                       rb_lib_log("%s: fopen ('%s'): %s", __func__, dhfile, strerror(errno));
+                       rb_lib_log("%s: BIO_new_file ('%s'): %s", __func__, dhfile,
+                                  rb_ssl_strerror(rb_ssl_last_err()));
                }
-               else if(PEM_read_DHparams(dhf, &dhp, NULL, NULL) == NULL)
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+               else if(PEM_read_bio_Parameters(dhf, &dhp) == NULL)
+               {
+                       rb_lib_log("%s: PEM_read_bio_Parameters ('%s'): %s", __func__, dhfile,
+                                  rb_ssl_strerror(rb_ssl_last_err()));
+               }
+#else
+               else if(PEM_read_bio_DHparams(dhf, &dhp, NULL, NULL) == NULL)
                {
-                       rb_lib_log("%s: PEM_read_DHparams ('%s'): %s", __func__, dhfile,
+                       rb_lib_log("%s: PEM_read_bio_DHparams ('%s'): %s", __func__, dhfile,
                                   rb_ssl_strerror(rb_ssl_last_err()));
-                       fclose(dhf);
                }
+#endif
                else
                {
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+                       if(SSL_CTX_set0_tmp_dh_pkey(ssl_ctx_new, dhp) != 1)
+                       {
+                               rb_lib_log("%s: SSL_CTX_set0_tmp_dh_pkey ('%s'): %s", __func__, dhfile,
+                                          rb_ssl_strerror(rb_ssl_last_err()));
+                               EVP_PKEY_free(dhp);
+                       }
+#else
                        SSL_CTX_set_tmp_dh(ssl_ctx_new, dhp);
                        DH_free(dhp);
-                       fclose(dhf);
+#endif
                }
-       }
 
+               BIO_free(dhf);
+       }
 
        int ret_old = SSL_CTX_set_cipher_list(ssl_ctx_new, cipherlist);