[前][次][番号順一覧][スレッド一覧]

ruby-changes:68500

From: David <ko1@a...>
Date: Sat, 16 Oct 2021 19:53:27 +0900 (JST)
Subject: [ruby-changes:68500] 6dcc74155f (master): [ruby/openssl] ts: libressl build fix warning

https://git.ruby-lang.org/ruby.git/commit/?id=6dcc74155f

From 6dcc74155f8b2951b7fed55cafae9cd27a73f090 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@g...>
Date: Sat, 4 Sep 2021 16:03:49 +0100
Subject: [ruby/openssl] ts: libressl build fix warning

TS_time_cb on libressl expects an long long/time_t 64 bits long instead.

https://github.com/ruby/openssl/commit/4c99f577b2
---
 ext/openssl/ossl_ts.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/openssl/ossl_ts.c b/ext/openssl/ossl_ts.c
index e2fd0fe06e..5cf674caa8 100644
--- a/ext/openssl/ossl_ts.c
+++ b/ext/openssl/ossl_ts.c
@@ -1077,7 +1077,11 @@ ossl_tsfac_serial_cb(struct TS_resp_ctx *ctx, void *data) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ts.c#L1077
 }
 
 static int
+#if !defined(LIBRESSL_VERSION_NUMBER)
 ossl_tsfac_time_cb(struct TS_resp_ctx *ctx, void *data, long *sec, long *usec)
+#else
+ossl_tsfac_time_cb(struct TS_resp_ctx *ctx, void *data, time_t *sec, long *usec)
+#endif
 {
     *sec = *((long *)data);
     *usec = 0;
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]