Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2025-05-06 17:51:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sha256's factory method return a ref<> instead of a raw pointer.

Browse Source
This commit is contained in:
Relintai 2022-01-09 15:29:03 +01:00
parent 8e903f2695
commit 7323c38776
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/hash_hashlib/hlib_sha256.cpp
View File

@ -49,6 +49,6 @@ HashLibSHA256::HashLibSHA256() {
HashLibSHA256::~HashLibSHA256() { HashLibSHA256::~HashLibSHA256() {
} }
SHA256 *HashLibSHA256::_creation_func() { Ref<SHA256> HashLibSHA256::_creation_func() {
return new HashLibSHA256(); return new HashLibSHA256();
} }

2
backends/hash_hashlib/hlib_sha256.h
View File

@ -23,7 +23,7 @@ public:
~HashLibSHA256(); ~HashLibSHA256();
protected: protected:
static SHA256 *_creation_func(); static Ref<SHA256> _creation_func();
_SHA256 hasher; _SHA256 hasher;
}; };

4
core/hash/sha256.cpp
View File

@ -8,7 +8,7 @@ SHA256::~SHA256() {
} }
SHA256 *SHA256::get() { Ref<SHA256> SHA256::get() {
if (_sha_256_creation_func == nullptr) { if (_sha_256_creation_func == nullptr) {
printf("Error: static SHA256 *get(): creation_func == nullptr\n"); printf("Error: static SHA256 *get(): creation_func == nullptr\n");
return nullptr; return nullptr;
@ -17,4 +17,4 @@ SHA256 *SHA256::get() {
return _sha_256_creation_func(); return _sha_256_creation_func();
} }
SHA256 *(*SHA256::_sha_256_creation_func)(void) = nullptr; Ref<SHA256> (*SHA256::_sha_256_creation_func)(void) = nullptr;

4
core/hash/sha256.h
View File

@ -18,13 +18,13 @@ public:
virtual void reset() = 0; virtual void reset() = 0;
static SHA256 *get(); static Ref<SHA256> get();
SHA256(); SHA256();
virtual ~SHA256(); virtual ~SHA256();
protected: protected:
static SHA256 *(*_sha_256_creation_func)(void); static Ref<SHA256> (*_sha_256_creation_func)(void);
}; };
#endif #endif

4
core/http/session_manager.cpp
View File

@ -216,7 +216,7 @@ void SessionManager::clear() {
String SessionManager::generate_session_id(const String &base) { String SessionManager::generate_session_id(const String &base) {
// todo make something simpler / better // todo make something simpler / better
SHA256 *h = SHA256::get(); Ref<SHA256> h = SHA256::get();
String sid = base; String sid = base;
sid += rand(); sid += rand();
@ -225,8 +225,6 @@ String SessionManager::generate_session_id(const String &base) {
sid = h->get_hash(); sid = h->get_hash();
sid.resize(20); sid.resize(20);
delete h;
return sid; return sid;
} }