|
|
@ -182,11 +182,13 @@ namespace garlic |
|
|
|
LogPrint (eLogError, "Garlic: Can't encode elligator"); |
|
|
|
LogPrint (eLogError, "Garlic: Can't encode elligator"); |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
uint8_t aepk[32]; |
|
|
|
|
|
|
|
i2p::crypto::GetElligator ()->Decode (out + offset, aepk); // decode back for h
|
|
|
|
offset += 32; |
|
|
|
offset += 32; |
|
|
|
|
|
|
|
|
|
|
|
// KDF1
|
|
|
|
// KDF1
|
|
|
|
MixHash (m_RemoteStaticKey, 32); // h = SHA256(h || bpk)
|
|
|
|
MixHash (m_RemoteStaticKey, 32); // h = SHA256(h || bpk)
|
|
|
|
MixHash (m_EphemeralKeys.GetPublicKey (), 32); // h = SHA256(h || aepk)
|
|
|
|
MixHash (aepk, 32); // h = SHA256(h || aepk)
|
|
|
|
uint8_t sharedSecret[32]; |
|
|
|
uint8_t sharedSecret[32]; |
|
|
|
m_EphemeralKeys.Agree (m_RemoteStaticKey, sharedSecret); // x25519(aesk, bpk)
|
|
|
|
m_EphemeralKeys.Agree (m_RemoteStaticKey, sharedSecret); // x25519(aesk, bpk)
|
|
|
|
i2p::crypto::HKDF (m_CK, sharedSecret, 32, "", m_CK); // [chainKey, key] = HKDF(chainKey, sharedSecret, "", 64)
|
|
|
|
i2p::crypto::HKDF (m_CK, sharedSecret, 32, "", m_CK); // [chainKey, key] = HKDF(chainKey, sharedSecret, "", 64)
|
|
|
@ -230,10 +232,12 @@ namespace garlic |
|
|
|
LogPrint (eLogError, "Garlic: Can't encode elligator"); |
|
|
|
LogPrint (eLogError, "Garlic: Can't encode elligator"); |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
uint8_t bepk[32]; |
|
|
|
|
|
|
|
i2p::crypto::GetElligator ()->Decode (out + offset, bepk); // decode back for h
|
|
|
|
offset += 32; |
|
|
|
offset += 32; |
|
|
|
// KDF for Reply Key Section
|
|
|
|
// KDF for Reply Key Section
|
|
|
|
MixHash ((const uint8_t *)&tag, 8); // h = SHA256(h || tag)
|
|
|
|
MixHash ((const uint8_t *)&tag, 8); // h = SHA256(h || tag)
|
|
|
|
MixHash (m_EphemeralKeys.GetPublicKey (), 32); // h = SHA256(h || bepk)
|
|
|
|
MixHash (bepk, 32); // h = SHA256(h || bepk)
|
|
|
|
uint8_t sharedSecret[32]; |
|
|
|
uint8_t sharedSecret[32]; |
|
|
|
m_EphemeralKeys.Agree (m_RemoteStaticKey, sharedSecret); // sharedSecret = x25519(besk, aepk)
|
|
|
|
m_EphemeralKeys.Agree (m_RemoteStaticKey, sharedSecret); // sharedSecret = x25519(besk, aepk)
|
|
|
|
i2p::crypto::HKDF (m_CK, sharedSecret, 32, "", m_CK); // [chainKey, key] = HKDF(chainKey, sharedSecret, "", 64)
|
|
|
|
i2p::crypto::HKDF (m_CK, sharedSecret, 32, "", m_CK); // [chainKey, key] = HKDF(chainKey, sharedSecret, "", 64)
|
|
|
|