From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Mon, 15 May 2017 16:03:49 +0000 (+0200)
Subject: rgw: drop 'using ceph::crypto::SHA256' from rgw_common.h.
X-Git-Tag: v12.1.0~155^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7de45576a81abfa23c76706c918babe8c112d985;p=ceph.git

rgw: drop 'using ceph::crypto::SHA256' from rgw_common.h.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_auth_s3.h b/src/rgw/rgw_auth_s3.h
index 11abf9ccc0e7..0d9c8eac28a8 100644
--- a/src/rgw/rgw_auth_s3.h
+++ b/src/rgw/rgw_auth_s3.h
@@ -200,7 +200,7 @@ class AWSv4ComplMulti : public rgw::auth::Completer,
 
   size_t stream_pos;
   boost::container::static_vector<char, ChunkMeta::META_MAX_SIZE> parsing_buf;
-  SHA256* sha256_hash;
+  ceph::crypto::SHA256* sha256_hash;
   std::string prev_chunk_signature;
 
   bool is_signature_mismatched();
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index a90a0daa9245..6d314df56aa4 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -2273,11 +2273,12 @@ calc_hmac_sha256(const std::array<unsigned char, KeyLenN>& key,
 
 extern sha256_digest_t calc_hash_sha256(const boost::string_view& msg);
 
-using ceph::crypto::SHA256;
-extern SHA256* calc_hash_sha256_open_stream();
-extern void calc_hash_sha256_update_stream(SHA256 *hash, const char *msg, int len);
-extern std::string calc_hash_sha256_close_stream(SHA256 **hash);
-extern std::string calc_hash_sha256_restart_stream(SHA256 **phash);
+extern ceph::crypto::SHA256* calc_hash_sha256_open_stream();
+extern void calc_hash_sha256_update_stream(ceph::crypto::SHA256* hash,
+                                           const char* msg,
+                                           int len);
+extern std::string calc_hash_sha256_close_stream(ceph::crypto::SHA256** phash);
+extern std::string calc_hash_sha256_restart_stream(ceph::crypto::SHA256** phash);
 
 extern int rgw_parse_op_type_list(const string& str, uint32_t *perm);