summaryrefslogtreecommitdiffstats
path: root/src/mbedTLS++
diff options
context:
space:
mode:
authorMat <mail@mathias.is>2020-04-07 23:23:54 +0200
committerGitHub <noreply@github.com>2020-04-07 23:23:54 +0200
commit6a21bf979c5ef4ad473971257f59fe9101397cd6 (patch)
treec8d2c94a59982b7a80a36542e77ae872158a6814 /src/mbedTLS++
parentFilter blocks to add to redstone sim's wake queue (#4621) (diff)
downloadcuberite-6a21bf979c5ef4ad473971257f59fe9101397cd6.tar
cuberite-6a21bf979c5ef4ad473971257f59fe9101397cd6.tar.gz
cuberite-6a21bf979c5ef4ad473971257f59fe9101397cd6.tar.bz2
cuberite-6a21bf979c5ef4ad473971257f59fe9101397cd6.tar.lz
cuberite-6a21bf979c5ef4ad473971257f59fe9101397cd6.tar.xz
cuberite-6a21bf979c5ef4ad473971257f59fe9101397cd6.tar.zst
cuberite-6a21bf979c5ef4ad473971257f59fe9101397cd6.zip
Diffstat (limited to '')
-rw-r--r--src/mbedTLS++/Sha1Checksum.cpp14
-rw-r--r--src/mbedTLS++/Sha1Checksum.h5
2 files changed, 18 insertions, 1 deletions
diff --git a/src/mbedTLS++/Sha1Checksum.cpp b/src/mbedTLS++/Sha1Checksum.cpp
index f55df025a..8ed7976ae 100644
--- a/src/mbedTLS++/Sha1Checksum.cpp
+++ b/src/mbedTLS++/Sha1Checksum.cpp
@@ -85,6 +85,20 @@ void cSha1Checksum::Finalize(cSha1Checksum::Checksum & a_Output)
+void cSha1Checksum::DigestToHex(const Checksum & a_Digest, AString & a_Out)
+{
+ a_Out.clear();
+ a_Out.reserve(40);
+ for (int i = 0; i < 20; i++)
+ {
+ AppendPrintf(a_Out, "%x", a_Digest[i]);
+ }
+}
+
+
+
+
+
void cSha1Checksum::DigestToJava(const Checksum & a_Digest, AString & a_Out)
{
Checksum Digest;
diff --git a/src/mbedTLS++/Sha1Checksum.h b/src/mbedTLS++/Sha1Checksum.h
index f85f5e8b5..dbe7db567 100644
--- a/src/mbedTLS++/Sha1Checksum.h
+++ b/src/mbedTLS++/Sha1Checksum.h
@@ -32,10 +32,13 @@ public:
/** Returns true if the object is accepts more input data, false if Finalize()-d (need to Restart()) */
bool DoesAcceptInput(void) const { return m_DoesAcceptInput; }
+ /** Converts a SHA1 digest into hex */
+ static void DigestToHex(const Checksum & a_Digest, AString & a_Out);
+
/** Converts a raw 160-bit SHA1 digest into a Java Hex representation
According to http://wiki.vg/Protocol_Encryption
*/
- static void DigestToJava(const Checksum & a_Digest, AString & a_JavaOut);
+ static void DigestToJava(const Checksum & a_Digest, AString & a_Out);
/** Clears the current context and start a new checksum calculation */
void Restart(void);