github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Renamed member variables
	* src/messageDigest.cc
	* src/messageDigest.h
pull/1/head
Tatsuhiro Tsujikawa 2010-06-12 14:22:11 +00:00
parent e81c207caf
commit e91fbed8ca
3 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables
* src/messageDigest.cc
* src/messageDigest.h
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Made protected member variable private. Made protected member variable private.

2
src/messageDigest.cc
View File

@ -103,7 +103,7 @@ std::string MessageDigestContext::getCanonicalAlgo
std::string MessageDigestContext::digestFinal() std::string MessageDigestContext::digestFinal()
{ {
size_t length = digestLength(algo); size_t length = digestLength(_algo);
unsigned char* rawMD = new unsigned char[length]; unsigned char* rawMD = new unsigned char[length];
digestFinal(rawMD); digestFinal(rawMD);
std::string rawMDString(&rawMD[0], &rawMD[length]); std::string rawMDString(&rawMD[0], &rawMD[length]);

58
src/messageDigest.h
View File

@ -70,14 +70,14 @@ public:
static const std::string MD5; static const std::string MD5;
private: private:
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
EVP_MD_CTX ctx; EVP_MD_CTX _ctx;
#endif // HAVE_LIBSSL #endif // HAVE_LIBSSL
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
gcry_md_hd_t ctx; gcry_md_hd_t _ctx;
#endif // HAVE_LIBGCRYPT #endif // HAVE_LIBGCRYPT
DigestAlgo algo; DigestAlgo _algo;
public: public:
MessageDigestContext():algo(getDigestAlgo(MessageDigestContext::SHA1)) MessageDigestContext():_algo(getDigestAlgo(MessageDigestContext::SHA1))
{} {}
~MessageDigestContext() ~MessageDigestContext()
@ -87,7 +87,7 @@ public:
void trySetAlgo(const std::string& algostring) void trySetAlgo(const std::string& algostring)
{ {
algo = getDigestAlgo(algostring); _algo = getDigestAlgo(algostring);
} }
static bool supports(const std::string& algostring); static bool supports(const std::string& algostring);
@ -117,16 +117,28 @@ public:
std::string digestFinal(); std::string digestFinal();
#if defined(HAVE_OLD_LIBSSL) #if defined(HAVE_OLD_LIBSSL)
void digestInit() {EVP_DigestInit(&ctx, algo);} void digestInit()
void digestReset() {EVP_DigestInit(&ctx, algo);} {
void digestUpdate(const void* data, size_t length) {EVP_DigestUpdate(&ctx, data, length);} EVP_DigestInit(&_ctx, _algo);
}
void digestReset()
{
EVP_DigestInit(&_ctx, _algo);
}
void digestUpdate(const void* data, size_t length)
{
EVP_DigestUpdate(&_ctx, data, length);
}
void digestFinal(unsigned char* md) { void digestFinal(unsigned char* md) {
unsigned int len; unsigned int len;
EVP_DigestFinal(&ctx, md, &len); EVP_DigestFinal(&_ctx, md, &len);
} }
void digestFree() {/*empty*/} void digestFree() {/*empty*/}
size_t digestLength() const { size_t digestLength() const {
return digestLength(algo); return digestLength(_algo);
} }
static size_t digestLength(DigestAlgo algo) { static size_t digestLength(DigestAlgo algo) {
return EVP_MD_size(algo); return EVP_MD_size(algo);
@ -134,24 +146,24 @@ public:
#elif defined(HAVE_LIBSSL) #elif defined(HAVE_LIBSSL)
void digestInit() { void digestInit() {
EVP_MD_CTX_init(&ctx); EVP_MD_CTX_init(&_ctx);
digestReset(); digestReset();
} }
void digestReset() { void digestReset() {
EVP_DigestInit_ex(&ctx, algo, 0); EVP_DigestInit_ex(&_ctx, _algo, 0);
} }
void digestUpdate(const void* data, size_t length) { void digestUpdate(const void* data, size_t length) {
EVP_DigestUpdate(&ctx, data, length); EVP_DigestUpdate(&_ctx, data, length);
} }
void digestFinal(unsigned char* md) { void digestFinal(unsigned char* md) {
unsigned int len; unsigned int len;
EVP_DigestFinal_ex(&ctx, md, &len); EVP_DigestFinal_ex(&_ctx, md, &len);
} }
void digestFree() { void digestFree() {
EVP_MD_CTX_cleanup(&ctx); EVP_MD_CTX_cleanup(&_ctx);
} }
size_t digestLength() const { size_t digestLength() const {
return digestLength(algo); return digestLength(_algo);
} }
static size_t digestLength(DigestAlgo algo) { static size_t digestLength(DigestAlgo algo) {
return EVP_MD_size(algo); return EVP_MD_size(algo);
@ -159,23 +171,23 @@ public:
#elif defined(HAVE_LIBGCRYPT) #elif defined(HAVE_LIBGCRYPT)
void digestInit() { void digestInit() {
gcry_md_open(&ctx, algo, 0); gcry_md_open(&_ctx, _algo, 0);
} }
void digestReset() { void digestReset() {
gcry_md_reset(ctx); gcry_md_reset(_ctx);
} }
void digestUpdate(const void* data, size_t length) { void digestUpdate(const void* data, size_t length) {
gcry_md_write(ctx, data, length); gcry_md_write(_ctx, data, length);
} }
void digestFinal(unsigned char* md) { void digestFinal(unsigned char* md) {
gcry_md_final(ctx); gcry_md_final(_ctx);
memcpy(md, gcry_md_read(ctx, 0), gcry_md_get_algo_dlen(algo)); memcpy(md, gcry_md_read(_ctx, 0), gcry_md_get_algo_dlen(_algo));
} }
void digestFree() { void digestFree() {
gcry_md_close(ctx); gcry_md_close(_ctx);
} }
size_t digestLength() const { size_t digestLength() const {
return digestLength(algo); return digestLength(_algo);
} }
static size_t digestLength(DigestAlgo algo) { static size_t digestLength(DigestAlgo algo) {
return gcry_md_get_algo_dlen(algo); return gcry_md_get_algo_dlen(algo);