From 6172edcf5d09433b17d6233e229476cfe17161f8 Mon Sep 17 00:00:00 2001 From: Pritha Srivastava Date: Mon, 19 May 2025 12:47:42 +0530 Subject: [PATCH] rgw/sts: fixing compilation error caused due to conflict in openssl SHA1() method and using ceph::crypto::SHA1 alias in rgw_torrent.h Signed-off-by: Pritha Srivastava --- src/rgw/rgw_torrent.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_torrent.h b/src/rgw/rgw_torrent.h index bf2e2217c2531..167b392591fe4 100644 --- a/src/rgw/rgw_torrent.h +++ b/src/rgw/rgw_torrent.h @@ -12,8 +12,6 @@ #include "rgw_common.h" -using ceph::crypto::SHA1; - struct req_state; #define RGW_OBJ_TORRENT "rgw.torrent" @@ -107,7 +105,7 @@ private: req_state *s{nullptr}; rgw::sal::Driver* driver{nullptr}; - SHA1 h; + ceph::crypto::SHA1 h; TorrentBencode dencode; public: @@ -134,6 +132,6 @@ private: void set_announce(); void set_exist(bool exist); void set_info_pieces(char *buff); - void sha1(SHA1 *h, bufferlist &bl, off_t bl_len); + void sha1(ceph::crypto::SHA1 *h, bufferlist &bl, off_t bl_len); int save_torrent_file(optional_yield y); }; -- 2.39.5