Merge pull request #17 from troian/digest_to_str

feat: digest to_string

Author: troian

CMakeLists.txt

@@ -23,10 +23,10 @@ set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation d
 set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
 
 find_package(OpenSSL REQUIRED)
-if (NOT WIN32)
+if (NOT WIN32 AND NOT JsonCPP_FOUND)
 	find_package(PkgConfig REQUIRED)
 	pkg_check_modules(JsonCPP REQUIRED jsoncpp)
-endif (NOT WIN32)
+endif ()
 
 include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
 include_directories(SYSTEM ${JsonCPP_INCLUDE_DIRS})

include/export/josepp/digest.hpp

@@ -39,6 +39,8 @@ class digest final {
 
 	uint8_t *data();
 
+	std::string to_string() const;
+
 public:
 	static const EVP_MD *md(digest::type t) {
 		switch (t) {

include/export/josepp/tools.hpp

@@ -23,7 +23,6 @@
 #pragma once
 
 #include <json/json.h>
-#include <json/value.h>
 
 #include <string>
 

src/digest.cpp

@@ -20,16 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <sstream>
+#include <iomanip>
+
 #include <josepp/digest.hpp>
 
 #include <openssl/sha.h>
 
 namespace jose {
 
-digest::digest(digest::type type, const uint8_t *in_data, size_t in_size) :
-	  _size(SHA256_DIGEST_LENGTH)
-	, _data(nullptr)
-{
+digest::digest(digest::type type, const uint8_t *in_data, size_t in_size)
+	: _size(SHA256_DIGEST_LENGTH)
+	, _data(nullptr) {
 	try {
 		_data = std::shared_ptr<uint8_t>(new uint8_t[SHA512_DIGEST_LENGTH], std::default_delete<uint8_t[]>());
 	} catch (...) {
@@ -90,19 +92,25 @@ digest::digest(digest::type type, const uint8_t *in_data, size_t in_size) :
 	}
 }
 
-digest::~digest()
-{
+digest::~digest() {
 	std::memset(_data.get(), 0, _size);
 }
 
-size_t digest::size() const
-{
+size_t digest::size() const {
 	return _size;
 }
 
-uint8_t *digest::data()
-{
+uint8_t *digest::data() {
 	return _data.get();
 }
 
+std::string digest::to_string() const {
+	std::stringstream s;
+	for (size_t i = 0; i < size() / 2; ++i) {
+		s << std::hex << std::setfill('0') << std::setw(2) << (_data.get()[i * 2] << 8 | _data.get()[(i * 2) + 1]);
+	}
+
+	return s.str();
+}
+
 } // namespace jose