projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consistently add APT_OVERRIDE as method marker
[apt.git]
/
apt-pkg
/
contrib
/
sha2.h
diff --git
a/apt-pkg/contrib/sha2.h
b/apt-pkg/contrib/sha2.h
index 386225889b69d3e15b4fbe7c89e68a4f780acc7c..8b4bdd439b1c80aef55b7a2799aefdd748ce1713 100644
(file)
--- a/
apt-pkg/contrib/sha2.h
+++ b/
apt-pkg/contrib/sha2.h
@@
-14,14
+14,18
@@
#ifndef APTPKG_SHA2_H
#define APTPKG_SHA2_H
#ifndef APTPKG_SHA2_H
#define APTPKG_SHA2_H
-#include <string>
#include <cstring>
#include <cstring>
-#include <algorithm>
-#include <stdint.h>
#include "sha2_internal.h"
#include "hashsum_template.h"
#include "sha2_internal.h"
#include "hashsum_template.h"
+#ifndef APT_10_CLEANER_HEADERS
+#include <string>
+#include <algorithm>
+#include <stdint.h>
+#endif
+
+
typedef HashSumValue<512> SHA512SumValue;
typedef HashSumValue<256> SHA256SumValue;
typedef HashSumValue<512> SHA512SumValue;
typedef HashSumValue<256> SHA256SumValue;
@@
-30,7
+34,7
@@
class SHA2SummationBase : public SummationImplementation
protected:
bool Done;
public:
protected:
bool Done;
public:
- bool Add(const unsigned char *inbuf, unsigned long l
en)
= 0;
+ bool Add(const unsigned char *inbuf, unsigned long l
ong len) APT_OVERRIDE
= 0;
void Result();
};
void Result();
};
@@
-41,7
+45,7
@@
class SHA256Summation : public SHA2SummationBase
unsigned char Sum[32];
public:
unsigned char Sum[32];
public:
- bool Add(const unsigned char *inbuf, unsigned long l
en)
+ bool Add(const unsigned char *inbuf, unsigned long l
ong len) APT_OVERRIDE
{
if (Done)
return false;
{
if (Done)
return false;
@@
-60,10
+64,11
@@
class SHA256Summation : public SHA2SummationBase
res.Set(Sum);
return res;
};
res.Set(Sum);
return res;
};
- SHA256Summation()
+ SHA256Summation()
{
SHA256_Init(&ctx);
Done = false;
{
SHA256_Init(&ctx);
Done = false;
+ memset(&Sum, 0, sizeof(Sum));
};
};
};
};
@@
-73,7
+78,7
@@
class SHA512Summation : public SHA2SummationBase
unsigned char Sum[64];
public:
unsigned char Sum[64];
public:
- bool Add(const unsigned char *inbuf, unsigned long l
en)
+ bool Add(const unsigned char *inbuf, unsigned long l
ong len) APT_OVERRIDE
{
if (Done)
return false;
{
if (Done)
return false;
@@
-96,6
+101,7
@@
class SHA512Summation : public SHA2SummationBase
{
SHA512_Init(&ctx);
Done = false;
{
SHA512_Init(&ctx);
Done = false;
+ memset(&Sum, 0, sizeof(Sum));
};
};
};
};