@ -13,7 +13,7 @@ namespace data
{ {
// copy public and signing keys together
// copy public and signing keys together
memcpy ( publicKey , keys . publicKey , sizeof ( publicKey ) + sizeof ( signingKey ) ) ; memcpy ( publicKey , keys . publicKey , sizeof ( publicKey ) + sizeof ( signingKey ) ) ;
memset ( certificate , 0 , sizeof ( certificate ) ) ; memset ( certificate , 0 , sizeof ( certificate ) ) ;
return * this ; return * this ;
} }
@ -32,8 +32,8 @@ namespace data
IdentHash hash ; IdentHash hash ;
SHA256 ( publicKey , DEFAULT_IDENTITY_SIZE , hash ) ; SHA256 ( publicKey , DEFAULT_IDENTITY_SIZE , hash ) ;
return hash ; return hash ;
} }
IdentityEx : : IdentityEx ( ) : IdentityEx : : IdentityEx ( ) :
m_IsVerifierCreated ( false ) , m_ExtendedLen ( 0 ) , m_ExtendedBuffer ( nullptr ) m_IsVerifierCreated ( false ) , m_ExtendedLen ( 0 ) , m_ExtendedBuffer ( nullptr )
{ {
@ -41,7 +41,7 @@ namespace data
IdentityEx : : IdentityEx ( const uint8_t * publicKey , const uint8_t * signingKey , SigningKeyType type ) : IdentityEx : : IdentityEx ( const uint8_t * publicKey , const uint8_t * signingKey , SigningKeyType type ) :
m_IsVerifierCreated ( false ) m_IsVerifierCreated ( false )
{ {
memcpy ( m_StandardIdentity . publicKey , publicKey , sizeof ( m_StandardIdentity . publicKey ) ) ; memcpy ( m_StandardIdentity . publicKey , publicKey , sizeof ( m_StandardIdentity . publicKey ) ) ;
if ( type ! = SIGNING_KEY_TYPE_DSA_SHA1 ) if ( type ! = SIGNING_KEY_TYPE_DSA_SHA1 )
{ {
@ -50,19 +50,19 @@ namespace data
switch ( type ) switch ( type )
{ {
case SIGNING_KEY_TYPE_ECDSA_SHA256_P256 : case SIGNING_KEY_TYPE_ECDSA_SHA256_P256 :
{ {
size_t padding = 128 - i2p : : crypto : : ECDSAP256_KEY_LENGTH ; // 64 = 128 - 64
size_t padding = 128 - i2p : : crypto : : ECDSAP256_KEY_LENGTH ; // 64 = 128 - 64
RAND_bytes ( m_StandardIdentity . signingKey , padding ) ; RAND_bytes ( m_StandardIdentity . signingKey , padding ) ;
memcpy ( m_StandardIdentity . signingKey + padding , signingKey , i2p : : crypto : : ECDSAP256_KEY_LENGTH ) ; memcpy ( m_StandardIdentity . signingKey + padding , signingKey , i2p : : crypto : : ECDSAP256_KEY_LENGTH ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_ECDSA_SHA384_P384 : case SIGNING_KEY_TYPE_ECDSA_SHA384_P384 :
{ {
size_t padding = 128 - i2p : : crypto : : ECDSAP384_KEY_LENGTH ; // 32 = 128 - 96
size_t padding = 128 - i2p : : crypto : : ECDSAP384_KEY_LENGTH ; // 32 = 128 - 96
RAND_bytes ( m_StandardIdentity . signingKey , padding ) ; RAND_bytes ( m_StandardIdentity . signingKey , padding ) ;
memcpy ( m_StandardIdentity . signingKey + padding , signingKey , i2p : : crypto : : ECDSAP384_KEY_LENGTH ) ; memcpy ( m_StandardIdentity . signingKey + padding , signingKey , i2p : : crypto : : ECDSAP384_KEY_LENGTH ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_ECDSA_SHA512_P521 : case SIGNING_KEY_TYPE_ECDSA_SHA512_P521 :
{ {
memcpy ( m_StandardIdentity . signingKey , signingKey , 128 ) ; memcpy ( m_StandardIdentity . signingKey , signingKey , 128 ) ;
@ -70,7 +70,7 @@ namespace data
excessBuf = new uint8_t [ excessLen ] ; excessBuf = new uint8_t [ excessLen ] ;
memcpy ( excessBuf , signingKey + 128 , excessLen ) ; memcpy ( excessBuf , signingKey + 128 , excessLen ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_RSA_SHA256_2048 : case SIGNING_KEY_TYPE_RSA_SHA256_2048 :
{ {
memcpy ( m_StandardIdentity . signingKey , signingKey , 128 ) ; memcpy ( m_StandardIdentity . signingKey , signingKey , 128 ) ;
@ -78,7 +78,7 @@ namespace data
excessBuf = new uint8_t [ excessLen ] ; excessBuf = new uint8_t [ excessLen ] ;
memcpy ( excessBuf , signingKey + 128 , excessLen ) ; memcpy ( excessBuf , signingKey + 128 , excessLen ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_RSA_SHA384_3072 : case SIGNING_KEY_TYPE_RSA_SHA384_3072 :
{ {
memcpy ( m_StandardIdentity . signingKey , signingKey , 128 ) ; memcpy ( m_StandardIdentity . signingKey , signingKey , 128 ) ;
@ -86,7 +86,7 @@ namespace data
excessBuf = new uint8_t [ excessLen ] ; excessBuf = new uint8_t [ excessLen ] ;
memcpy ( excessBuf , signingKey + 128 , excessLen ) ; memcpy ( excessBuf , signingKey + 128 , excessLen ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_RSA_SHA512_4096 : case SIGNING_KEY_TYPE_RSA_SHA512_4096 :
{ {
memcpy ( m_StandardIdentity . signingKey , signingKey , 128 ) ; memcpy ( m_StandardIdentity . signingKey , signingKey , 128 ) ;
@ -94,17 +94,17 @@ namespace data
excessBuf = new uint8_t [ excessLen ] ; excessBuf = new uint8_t [ excessLen ] ;
memcpy ( excessBuf , signingKey + 128 , excessLen ) ; memcpy ( excessBuf , signingKey + 128 , excessLen ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 : case SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 :
{ {
size_t padding = 128 - i2p : : crypto : : EDDSA25519_PUBLIC_KEY_LENGTH ; // 96 = 128 - 32
size_t padding = 128 - i2p : : crypto : : EDDSA25519_PUBLIC_KEY_LENGTH ; // 96 = 128 - 32
RAND_bytes ( m_StandardIdentity . signingKey , padding ) ; RAND_bytes ( m_StandardIdentity . signingKey , padding ) ;
memcpy ( m_StandardIdentity . signingKey + padding , signingKey , i2p : : crypto : : EDDSA25519_PUBLIC_KEY_LENGTH ) ; memcpy ( m_StandardIdentity . signingKey + padding , signingKey , i2p : : crypto : : EDDSA25519_PUBLIC_KEY_LENGTH ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256 : case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256 :
case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST : case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST :
{ {
// 256
// 256
size_t padding = 128 - i2p : : crypto : : GOSTR3410_256_PUBLIC_KEY_LENGTH ; // 64 = 128 - 64
size_t padding = 128 - i2p : : crypto : : GOSTR3410_256_PUBLIC_KEY_LENGTH ; // 64 = 128 - 64
RAND_bytes ( m_StandardIdentity . signingKey , padding ) ; RAND_bytes ( m_StandardIdentity . signingKey , padding ) ;
@ -112,20 +112,20 @@ namespace data
break ; break ;
} }
case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512 : case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512 :
case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST : case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST :
{ {
// 512
// 512
// no padding, key length is 128
// no padding, key length is 128
memcpy ( m_StandardIdentity . signingKey , signingKey , i2p : : crypto : : GOSTR3410_512_PUBLIC_KEY_LENGTH ) ; memcpy ( m_StandardIdentity . signingKey , signingKey , i2p : : crypto : : GOSTR3410_512_PUBLIC_KEY_LENGTH ) ;
break ; break ;
} }
default : default :
LogPrint ( eLogError , " Identity: Signing key type " , ( int ) type , " is not supported " ) ; LogPrint ( eLogError , " Identity: Signing key type " , ( int ) type , " is not supported " ) ;
} }
m_ExtendedLen = 4 + excessLen ; // 4 bytes extra + excess length
m_ExtendedLen = 4 + excessLen ; // 4 bytes extra + excess length
// fill certificate
// fill certificate
m_StandardIdentity . certificate [ 0 ] = CERTIFICATE_TYPE_KEY ; m_StandardIdentity . certificate [ 0 ] = CERTIFICATE_TYPE_KEY ;
htobe16buf ( m_StandardIdentity . certificate + 1 , m_ExtendedLen ) ; htobe16buf ( m_StandardIdentity . certificate + 1 , m_ExtendedLen ) ;
// fill extended buffer
// fill extended buffer
m_ExtendedBuffer = new uint8_t [ m_ExtendedLen ] ; m_ExtendedBuffer = new uint8_t [ m_ExtendedLen ] ;
htobe16buf ( m_ExtendedBuffer , type ) ; htobe16buf ( m_ExtendedBuffer , type ) ;
@ -134,12 +134,9 @@ namespace data
{ {
memcpy ( m_ExtendedBuffer + 4 , excessBuf , excessLen ) ; memcpy ( m_ExtendedBuffer + 4 , excessBuf , excessLen ) ;
delete [ ] excessBuf ; delete [ ] excessBuf ;
} }
// calculate ident hash
// calculate ident hash
uint8_t * buf = new uint8_t [ GetFullLen ( ) ] ; RecalculateIdentHash ( ) ;
ToBuffer ( buf , GetFullLen ( ) ) ;
SHA256 ( buf , GetFullLen ( ) , m_IdentHash ) ;
delete [ ] buf ;
} }
else // DSA-SHA1
else // DSA-SHA1
{ {
@ -148,10 +145,22 @@ namespace data
m_IdentHash = m_StandardIdentity . Hash ( ) ; m_IdentHash = m_StandardIdentity . Hash ( ) ;
m_ExtendedLen = 0 ; m_ExtendedLen = 0 ;
m_ExtendedBuffer = nullptr ; m_ExtendedBuffer = nullptr ;
} }
CreateVerifier ( ) ; CreateVerifier ( ) ;
} }
void IdentityEx : : RecalculateIdentHash ( uint8_t * buf )
{
bool dofree = buf = = nullptr ;
size_t sz = GetFullLen ( ) ;
if ( ! buf )
buf = new uint8_t [ sz ] ;
ToBuffer ( buf , sz ) ;
SHA256 ( buf , sz , m_IdentHash ) ;
if ( dofree )
delete [ ] buf ;
}
IdentityEx : : IdentityEx ( const uint8_t * buf , size_t len ) : IdentityEx : : IdentityEx ( const uint8_t * buf , size_t len ) :
m_IsVerifierCreated ( false ) , m_ExtendedLen ( 0 ) , m_ExtendedBuffer ( nullptr ) m_IsVerifierCreated ( false ) , m_ExtendedLen ( 0 ) , m_ExtendedBuffer ( nullptr )
{ {
@ -162,62 +171,62 @@ namespace data
m_IsVerifierCreated ( false ) , m_ExtendedLen ( 0 ) , m_ExtendedBuffer ( nullptr ) m_IsVerifierCreated ( false ) , m_ExtendedLen ( 0 ) , m_ExtendedBuffer ( nullptr )
{ {
* this = other ; * this = other ;
} }
IdentityEx : : IdentityEx ( const Identity & standard ) : IdentityEx : : IdentityEx ( const Identity & standard ) :
m_IsVerifierCreated ( false ) , m_ExtendedLen ( 0 ) , m_ExtendedBuffer ( nullptr ) m_IsVerifierCreated ( false ) , m_ExtendedLen ( 0 ) , m_ExtendedBuffer ( nullptr )
{ {
* this = standard ; * this = standard ;
} }
IdentityEx : : ~ IdentityEx ( ) IdentityEx : : ~ IdentityEx ( )
{ {
delete [ ] m_ExtendedBuffer ; delete [ ] m_ExtendedBuffer ;
} }
IdentityEx & IdentityEx : : operator = ( const IdentityEx & other ) IdentityEx & IdentityEx : : operator = ( const IdentityEx & other )
{ {
memcpy ( & m_StandardIdentity , & other . m_StandardIdentity , DEFAULT_IDENTITY_SIZE ) ; memcpy ( & m_StandardIdentity , & other . m_StandardIdentity , DEFAULT_IDENTITY_SIZE ) ;
m_IdentHash = other . m_IdentHash ; m_IdentHash = other . m_IdentHash ;
delete [ ] m_ExtendedBuffer ; delete [ ] m_ExtendedBuffer ;
m_ExtendedLen = other . m_ExtendedLen ; m_ExtendedLen = other . m_ExtendedLen ;
if ( m_ExtendedLen > 0 ) if ( m_ExtendedLen > 0 )
{ {
m_ExtendedBuffer = new uint8_t [ m_ExtendedLen ] ; m_ExtendedBuffer = new uint8_t [ m_ExtendedLen ] ;
memcpy ( m_ExtendedBuffer , other . m_ExtendedBuffer , m_ExtendedLen ) ; memcpy ( m_ExtendedBuffer , other . m_ExtendedBuffer , m_ExtendedLen ) ;
} }
else else
m_ExtendedBuffer = nullptr ; m_ExtendedBuffer = nullptr ;
m_Verifier = nullptr ; m_Verifier = nullptr ;
m_IsVerifierCreated = false ; m_IsVerifierCreated = false ;
return * this ; return * this ;
} }
IdentityEx & IdentityEx : : operator = ( const Identity & standard ) IdentityEx & IdentityEx : : operator = ( const Identity & standard )
{ {
m_StandardIdentity = standard ; m_StandardIdentity = standard ;
m_IdentHash = m_StandardIdentity . Hash ( ) ; m_IdentHash = m_StandardIdentity . Hash ( ) ;
delete [ ] m_ExtendedBuffer ; delete [ ] m_ExtendedBuffer ;
m_ExtendedBuffer = nullptr ; m_ExtendedBuffer = nullptr ;
m_ExtendedLen = 0 ; m_ExtendedLen = 0 ;
m_Verifier = nullptr ; m_Verifier = nullptr ;
m_IsVerifierCreated = false ; m_IsVerifierCreated = false ;
return * this ; return * this ;
} }
size_t IdentityEx : : FromBuffer ( const uint8_t * buf , size_t len ) size_t IdentityEx : : FromBuffer ( const uint8_t * buf , size_t len )
{ {
if ( len < DEFAULT_IDENTITY_SIZE ) if ( len < DEFAULT_IDENTITY_SIZE )
{ {
LogPrint ( eLogError , " Identity: buffer length " , len , " is too small " ) ; LogPrint ( eLogError , " Identity: buffer length " , len , " is too small " ) ;
return 0 ; return 0 ;
} }
memcpy ( & m_StandardIdentity , buf , DEFAULT_IDENTITY_SIZE ) ; memcpy ( & m_StandardIdentity , buf , DEFAULT_IDENTITY_SIZE ) ;
if ( m_ExtendedBuffer ) delete [ ] m_ExtendedBuffer ; if ( m_ExtendedBuffer ) delete [ ] m_ExtendedBuffer ;
@ -227,28 +236,28 @@ namespace data
if ( m_ExtendedLen ) if ( m_ExtendedLen )
{ {
if ( m_ExtendedLen + DEFAULT_IDENTITY_SIZE < = len ) if ( m_ExtendedLen + DEFAULT_IDENTITY_SIZE < = len )
{ {
m_ExtendedBuffer = new uint8_t [ m_ExtendedLen ] ; m_ExtendedBuffer = new uint8_t [ m_ExtendedLen ] ;
memcpy ( m_ExtendedBuffer , buf + DEFAULT_IDENTITY_SIZE , m_ExtendedLen ) ; memcpy ( m_ExtendedBuffer , buf + DEFAULT_IDENTITY_SIZE , m_ExtendedLen ) ;
} }
else else
{ {
LogPrint ( eLogError , " Identity: Certificate length " , m_ExtendedLen , " exceeds buffer length " , len - DEFAULT_IDENTITY_SIZE ) ; LogPrint ( eLogError , " Identity: Certificate length " , m_ExtendedLen , " exceeds buffer length " , len - DEFAULT_IDENTITY_SIZE ) ;
m_ExtendedLen = 0 ; m_ExtendedLen = 0 ;
return 0 ; return 0 ;
} }
} }
else else
{ {
m_ExtendedLen = 0 ; m_ExtendedLen = 0 ;
m_ExtendedBuffer = nullptr ; m_ExtendedBuffer = nullptr ;
} }
SHA256 ( buf , GetFullLen ( ) , m_IdentHash ) ; SHA256 ( buf , GetFullLen ( ) , m_IdentHash ) ;
m_Verifier = nullptr ; m_Verifier = nullptr ;
return GetFullLen ( ) ; return GetFullLen ( ) ;
} }
size_t IdentityEx : : ToBuffer ( uint8_t * buf , size_t len ) const size_t IdentityEx : : ToBuffer ( uint8_t * buf , size_t len ) const
{ {
@ -266,8 +275,8 @@ namespace data
std : : vector < uint8_t > buf ( slen ) ; // binary data can't exceed base64
std : : vector < uint8_t > buf ( slen ) ; // binary data can't exceed base64
const size_t len = Base64ToByteStream ( s . c_str ( ) , slen , buf . data ( ) , slen ) ; const size_t len = Base64ToByteStream ( s . c_str ( ) , slen , buf . data ( ) , slen ) ;
return FromBuffer ( buf . data ( ) , len ) ; return FromBuffer ( buf . data ( ) , len ) ;
} }
std : : string IdentityEx : : ToBase64 ( ) const std : : string IdentityEx : : ToBase64 ( ) const
{ {
const size_t bufLen = GetFullLen ( ) ; const size_t bufLen = GetFullLen ( ) ;
@ -278,53 +287,53 @@ namespace data
size_t l1 = i2p : : data : : ByteStreamToBase64 ( buf . data ( ) , l , str . data ( ) , strLen ) ; size_t l1 = i2p : : data : : ByteStreamToBase64 ( buf . data ( ) , l , str . data ( ) , strLen ) ;
return std : : string ( str . data ( ) , l1 ) ; return std : : string ( str . data ( ) , l1 ) ;
} }
size_t IdentityEx : : GetSigningPublicKeyLen ( ) const size_t IdentityEx : : GetSigningPublicKeyLen ( ) const
{ {
if ( ! m_Verifier ) CreateVerifier ( ) ; if ( ! m_Verifier ) CreateVerifier ( ) ;
if ( m_Verifier ) if ( m_Verifier )
return m_Verifier - > GetPublicKeyLen ( ) ; return m_Verifier - > GetPublicKeyLen ( ) ;
return 128 ; return 128 ;
} }
size_t IdentityEx : : GetSigningPrivateKeyLen ( ) const size_t IdentityEx : : GetSigningPrivateKeyLen ( ) const
{ {
if ( ! m_Verifier ) CreateVerifier ( ) ; if ( ! m_Verifier ) CreateVerifier ( ) ;
if ( m_Verifier ) if ( m_Verifier )
return m_Verifier - > GetPrivateKeyLen ( ) ; return m_Verifier - > GetPrivateKeyLen ( ) ;
return GetSignatureLen ( ) / 2 ; return GetSignatureLen ( ) / 2 ;
} }
size_t IdentityEx : : GetSignatureLen ( ) const size_t IdentityEx : : GetSignatureLen ( ) const
{ {
if ( ! m_Verifier ) CreateVerifier ( ) ; if ( ! m_Verifier ) CreateVerifier ( ) ;
if ( m_Verifier ) if ( m_Verifier )
return m_Verifier - > GetSignatureLen ( ) ; return m_Verifier - > GetSignatureLen ( ) ;
return i2p : : crypto : : DSA_SIGNATURE_LENGTH ; return i2p : : crypto : : DSA_SIGNATURE_LENGTH ;
} }
bool IdentityEx : : Verify ( const uint8_t * buf , size_t len , const uint8_t * signature ) const bool IdentityEx : : Verify ( const uint8_t * buf , size_t len , const uint8_t * signature ) const
{ {
if ( ! m_Verifier ) CreateVerifier ( ) ; if ( ! m_Verifier ) CreateVerifier ( ) ;
if ( m_Verifier ) if ( m_Verifier )
return m_Verifier - > Verify ( buf , len , signature ) ; return m_Verifier - > Verify ( buf , len , signature ) ;
return false ; return false ;
} }
SigningKeyType IdentityEx : : GetSigningKeyType ( ) const SigningKeyType IdentityEx : : GetSigningKeyType ( ) const
{ {
if ( m_StandardIdentity . certificate [ 0 ] = = CERTIFICATE_TYPE_KEY & & m_ExtendedLen > = 2 ) if ( m_StandardIdentity . certificate [ 0 ] = = CERTIFICATE_TYPE_KEY & & m_ExtendedLen > = 2 )
return bufbe16toh ( m_ExtendedBuffer ) ; // signing key
return bufbe16toh ( m_ExtendedBuffer ) ; // signing key
return SIGNING_KEY_TYPE_DSA_SHA1 ; return SIGNING_KEY_TYPE_DSA_SHA1 ;
} }
CryptoKeyType IdentityEx : : GetCryptoKeyType ( ) const CryptoKeyType IdentityEx : : GetCryptoKeyType ( ) const
{ {
if ( m_StandardIdentity . certificate [ 0 ] = = CERTIFICATE_TYPE_KEY & & m_ExtendedLen > = 4 ) if ( m_StandardIdentity . certificate [ 0 ] = = CERTIFICATE_TYPE_KEY & & m_ExtendedLen > = 4 )
return bufbe16toh ( m_ExtendedBuffer + 2 ) ; // crypto key
return bufbe16toh ( m_ExtendedBuffer + 2 ) ; // crypto key
return CRYPTO_KEY_TYPE_ELGAMAL ; return CRYPTO_KEY_TYPE_ELGAMAL ;
} }
void IdentityEx : : CreateVerifier ( ) const void IdentityEx : : CreateVerifier ( ) const
{ {
if ( m_Verifier ) return ; // don't create again
if ( m_Verifier ) return ; // don't create again
auto keyType = GetSigningKeyType ( ) ; auto keyType = GetSigningKeyType ( ) ;
@ -334,77 +343,77 @@ namespace data
UpdateVerifier ( new i2p : : crypto : : DSAVerifier ( m_StandardIdentity . signingKey ) ) ; UpdateVerifier ( new i2p : : crypto : : DSAVerifier ( m_StandardIdentity . signingKey ) ) ;
break ; break ;
case SIGNING_KEY_TYPE_ECDSA_SHA256_P256 : case SIGNING_KEY_TYPE_ECDSA_SHA256_P256 :
{ {
size_t padding = 128 - i2p : : crypto : : ECDSAP256_KEY_LENGTH ; // 64 = 128 - 64
size_t padding = 128 - i2p : : crypto : : ECDSAP256_KEY_LENGTH ; // 64 = 128 - 64
UpdateVerifier ( new i2p : : crypto : : ECDSAP256Verifier ( m_StandardIdentity . signingKey + padding ) ) ; UpdateVerifier ( new i2p : : crypto : : ECDSAP256Verifier ( m_StandardIdentity . signingKey + padding ) ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_ECDSA_SHA384_P384 : case SIGNING_KEY_TYPE_ECDSA_SHA384_P384 :
{ {
size_t padding = 128 - i2p : : crypto : : ECDSAP384_KEY_LENGTH ; // 32 = 128 - 96
size_t padding = 128 - i2p : : crypto : : ECDSAP384_KEY_LENGTH ; // 32 = 128 - 96
UpdateVerifier ( new i2p : : crypto : : ECDSAP384Verifier ( m_StandardIdentity . signingKey + padding ) ) ; UpdateVerifier ( new i2p : : crypto : : ECDSAP384Verifier ( m_StandardIdentity . signingKey + padding ) ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_ECDSA_SHA512_P521 : case SIGNING_KEY_TYPE_ECDSA_SHA512_P521 :
{ {
uint8_t signingKey [ i2p : : crypto : : ECDSAP521_KEY_LENGTH ] ; uint8_t signingKey [ i2p : : crypto : : ECDSAP521_KEY_LENGTH ] ;
memcpy ( signingKey , m_StandardIdentity . signingKey , 128 ) ; memcpy ( signingKey , m_StandardIdentity . signingKey , 128 ) ;
size_t excessLen = i2p : : crypto : : ECDSAP521_KEY_LENGTH - 128 ; // 4 = 132- 128
size_t excessLen = i2p : : crypto : : ECDSAP521_KEY_LENGTH - 128 ; // 4 = 132- 128
memcpy ( signingKey + 128 , m_ExtendedBuffer + 4 , excessLen ) ; // right after signing and crypto key types
memcpy ( signingKey + 128 , m_ExtendedBuffer + 4 , excessLen ) ; // right after signing and crypto key types
UpdateVerifier ( new i2p : : crypto : : ECDSAP521Verifier ( signingKey ) ) ; UpdateVerifier ( new i2p : : crypto : : ECDSAP521Verifier ( signingKey ) ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_RSA_SHA256_2048 : case SIGNING_KEY_TYPE_RSA_SHA256_2048 :
{ {
uint8_t signingKey [ i2p : : crypto : : RSASHA2562048_KEY_LENGTH ] ; uint8_t signingKey [ i2p : : crypto : : RSASHA2562048_KEY_LENGTH ] ;
memcpy ( signingKey , m_StandardIdentity . signingKey , 128 ) ; memcpy ( signingKey , m_StandardIdentity . signingKey , 128 ) ;
size_t excessLen = i2p : : crypto : : RSASHA2562048_KEY_LENGTH - 128 ; // 128 = 256- 128
size_t excessLen = i2p : : crypto : : RSASHA2562048_KEY_LENGTH - 128 ; // 128 = 256- 128
memcpy ( signingKey + 128 , m_ExtendedBuffer + 4 , excessLen ) ; // right after signing and crypto key types
memcpy ( signingKey + 128 , m_ExtendedBuffer + 4 , excessLen ) ; // right after signing and crypto key types
UpdateVerifier ( new i2p : : crypto : : RSASHA2562048Verifier ( signingKey ) ) ; UpdateVerifier ( new i2p : : crypto : : RSASHA2562048Verifier ( signingKey ) ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_RSA_SHA384_3072 : case SIGNING_KEY_TYPE_RSA_SHA384_3072 :
{ {
uint8_t signingKey [ i2p : : crypto : : RSASHA3843072_KEY_LENGTH ] ; uint8_t signingKey [ i2p : : crypto : : RSASHA3843072_KEY_LENGTH ] ;
memcpy ( signingKey , m_StandardIdentity . signingKey , 128 ) ; memcpy ( signingKey , m_StandardIdentity . signingKey , 128 ) ;
size_t excessLen = i2p : : crypto : : RSASHA3843072_KEY_LENGTH - 128 ; // 256 = 384- 128
size_t excessLen = i2p : : crypto : : RSASHA3843072_KEY_LENGTH - 128 ; // 256 = 384- 128
memcpy ( signingKey + 128 , m_ExtendedBuffer + 4 , excessLen ) ; // right after signing and crypto key types
memcpy ( signingKey + 128 , m_ExtendedBuffer + 4 , excessLen ) ; // right after signing and crypto key types
UpdateVerifier ( new i2p : : crypto : : RSASHA3843072Verifier ( signingKey ) ) ; UpdateVerifier ( new i2p : : crypto : : RSASHA3843072Verifier ( signingKey ) ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_RSA_SHA512_4096 : case SIGNING_KEY_TYPE_RSA_SHA512_4096 :
{ {
uint8_t signingKey [ i2p : : crypto : : RSASHA5124096_KEY_LENGTH ] ; uint8_t signingKey [ i2p : : crypto : : RSASHA5124096_KEY_LENGTH ] ;
memcpy ( signingKey , m_StandardIdentity . signingKey , 128 ) ; memcpy ( signingKey , m_StandardIdentity . signingKey , 128 ) ;
size_t excessLen = i2p : : crypto : : RSASHA5124096_KEY_LENGTH - 128 ; // 384 = 512- 128
size_t excessLen = i2p : : crypto : : RSASHA5124096_KEY_LENGTH - 128 ; // 384 = 512- 128
memcpy ( signingKey + 128 , m_ExtendedBuffer + 4 , excessLen ) ; // right after signing and crypto key types
memcpy ( signingKey + 128 , m_ExtendedBuffer + 4 , excessLen ) ; // right after signing and crypto key types
UpdateVerifier ( new i2p : : crypto : : RSASHA5124096Verifier ( signingKey ) ) ; UpdateVerifier ( new i2p : : crypto : : RSASHA5124096Verifier ( signingKey ) ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 : case SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 :
{ {
size_t padding = 128 - i2p : : crypto : : EDDSA25519_PUBLIC_KEY_LENGTH ; // 96 = 128 - 32
size_t padding = 128 - i2p : : crypto : : EDDSA25519_PUBLIC_KEY_LENGTH ; // 96 = 128 - 32
UpdateVerifier ( new i2p : : crypto : : EDDSA25519Verifier ( m_StandardIdentity . signingKey + padding ) ) ; UpdateVerifier ( new i2p : : crypto : : EDDSA25519Verifier ( m_StandardIdentity . signingKey + padding ) ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256 : case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256 :
case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST : case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST :
{ {
size_t padding = 128 - i2p : : crypto : : GOSTR3410_256_PUBLIC_KEY_LENGTH ; // 64 = 128 - 64
size_t padding = 128 - i2p : : crypto : : GOSTR3410_256_PUBLIC_KEY_LENGTH ; // 64 = 128 - 64
UpdateVerifier ( new i2p : : crypto : : GOSTR3410_256_Verifier ( i2p : : crypto : : eGOSTR3410CryptoProA , m_StandardIdentity . signingKey + padding ) ) ; UpdateVerifier ( new i2p : : crypto : : GOSTR3410_256_Verifier ( i2p : : crypto : : eGOSTR3410CryptoProA , m_StandardIdentity . signingKey + padding ) ) ;
break ; break ;
} }
case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512 : case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512 :
case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST : case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST :
{ {
// zero padding
// zero padding
UpdateVerifier ( new i2p : : crypto : : GOSTR3410_512_Verifier ( i2p : : crypto : : eGOSTR3410TC26A512 , m_StandardIdentity . signingKey ) ) ; UpdateVerifier ( new i2p : : crypto : : GOSTR3410_512_Verifier ( i2p : : crypto : : eGOSTR3410TC26A512 , m_StandardIdentity . signingKey ) ) ;
break ; break ;
} }
default : default :
LogPrint ( eLogError , " Identity: Signing key type " , ( int ) keyType , " is not supported " ) ; LogPrint ( eLogError , " Identity: Signing key type " , ( int ) keyType , " is not supported " ) ;
} }
} }
void IdentityEx : : UpdateVerifier ( i2p : : crypto : : Verifier * verifier ) const void IdentityEx : : UpdateVerifier ( i2p : : crypto : : Verifier * verifier ) const
{ {
@ -418,29 +427,29 @@ namespace data
delete verifier ; delete verifier ;
int count = 0 ; int count = 0 ;
while ( ! m_Verifier & & count < 500 ) // 5 seconds
while ( ! m_Verifier & & count < 500 ) // 5 seconds
{ {
std : : this_thread : : sleep_for ( std : : chrono : : milliseconds ( 10 ) ) ; std : : this_thread : : sleep_for ( std : : chrono : : milliseconds ( 10 ) ) ;
count + + ; count + + ;
} }
if ( ! m_Verifier ) if ( ! m_Verifier )
LogPrint ( eLogError , " Identity: couldn't get verifier in 5 seconds " ) ; LogPrint ( eLogError , " Identity: couldn't get verifier in 5 seconds " ) ;
} }
} }
else else
delete verifier ; delete verifier ;
} }
void IdentityEx : : DropVerifier ( ) const void IdentityEx : : DropVerifier ( ) const
{ {
// TODO: potential race condition with Verify
// TODO: potential race condition with Verify
m_IsVerifierCreated = false ; m_IsVerifierCreated = false ;
m_Verifier = nullptr ; m_Verifier = nullptr ;
} }
PrivateKeys & PrivateKeys : : operator = ( const Keys & keys ) PrivateKeys & PrivateKeys : : operator = ( const Keys & keys )
{ {
m_Public = std : : make_shared < IdentityEx > ( Identity ( keys ) ) ; m_Public = std : : make_shared < IdentityEx > ( Identity ( keys ) ) ;
memcpy ( m_PrivateKey , keys . privateKey , 256 ) ; // 256
memcpy ( m_PrivateKey , keys . privateKey , 256 ) ; // 256
memcpy ( m_SigningPrivateKey , keys . signingPrivateKey , m_Public - > GetSigningPrivateKeyLen ( ) ) ; memcpy ( m_SigningPrivateKey , keys . signingPrivateKey , m_Public - > GetSigningPrivateKeyLen ( ) ) ;
m_Signer = nullptr ; m_Signer = nullptr ;
CreateSigner ( ) ; CreateSigner ( ) ;
@ -448,31 +457,31 @@ namespace data
} }
PrivateKeys & PrivateKeys : : operator = ( const PrivateKeys & other ) PrivateKeys & PrivateKeys : : operator = ( const PrivateKeys & other )
{ {
m_Public = std : : make_shared < IdentityEx > ( * other . m_Public ) ; m_Public = std : : make_shared < IdentityEx > ( * other . m_Public ) ;
memcpy ( m_PrivateKey , other . m_PrivateKey , 256 ) ; // 256
memcpy ( m_PrivateKey , other . m_PrivateKey , 256 ) ; // 256
memcpy ( m_SigningPrivateKey , other . m_SigningPrivateKey , m_Public - > GetSigningPrivateKeyLen ( ) ) ; memcpy ( m_SigningPrivateKey , other . m_SigningPrivateKey , m_Public - > GetSigningPrivateKeyLen ( ) ) ;
m_Signer = nullptr ; m_Signer = nullptr ;
CreateSigner ( ) ; CreateSigner ( ) ;
return * this ; return * this ;
} }
size_t PrivateKeys : : FromBuffer ( const uint8_t * buf , size_t len ) size_t PrivateKeys : : FromBuffer ( const uint8_t * buf , size_t len )
{ {
m_Public = std : : make_shared < IdentityEx > ( ) ; m_Public = std : : make_shared < IdentityEx > ( ) ;
size_t ret = m_Public - > FromBuffer ( buf , len ) ; size_t ret = m_Public - > FromBuffer ( buf , len ) ;
if ( ! ret | | ret + 256 > len ) return 0 ; // overflow
if ( ! ret | | ret + 256 > len ) return 0 ; // overflow
memcpy ( m_PrivateKey , buf + ret , 256 ) ; // private key always 256
memcpy ( m_PrivateKey , buf + ret , 256 ) ; // private key always 256
ret + = 256 ; ret + = 256 ;
size_t signingPrivateKeySize = m_Public - > GetSigningPrivateKeyLen ( ) ; size_t signingPrivateKeySize = m_Public - > GetSigningPrivateKeyLen ( ) ;
if ( signingPrivateKeySize + ret > len ) return 0 ; // overflow
if ( signingPrivateKeySize + ret > len ) return 0 ; // overflow
memcpy ( m_SigningPrivateKey , buf + ret , signingPrivateKeySize ) ; memcpy ( m_SigningPrivateKey , buf + ret , signingPrivateKeySize ) ;
ret + = signingPrivateKeySize ; ret + = signingPrivateKeySize ;
m_Signer = nullptr ; m_Signer = nullptr ;
CreateSigner ( ) ; CreateSigner ( ) ;
return ret ; return ret ;
} }
size_t PrivateKeys : : ToBuffer ( uint8_t * buf , size_t len ) const size_t PrivateKeys : : ToBuffer ( uint8_t * buf , size_t len ) const
{ {
size_t ret = m_Public - > ToBuffer ( buf , len ) ; size_t ret = m_Public - > ToBuffer ( buf , len ) ;
@ -480,10 +489,10 @@ namespace data
ret + = 256 ; ret + = 256 ;
size_t signingPrivateKeySize = m_Public - > GetSigningPrivateKeyLen ( ) ; size_t signingPrivateKeySize = m_Public - > GetSigningPrivateKeyLen ( ) ;
if ( ret + signingPrivateKeySize > len ) return 0 ; // overflow
if ( ret + signingPrivateKeySize > len ) return 0 ; // overflow
memcpy ( buf + ret , m_SigningPrivateKey , signingPrivateKeySize ) ; memcpy ( buf + ret , m_SigningPrivateKey , signingPrivateKeySize ) ;
ret + = signingPrivateKeySize ; ret + = signingPrivateKeySize ;
return ret ; return ret ;
} }
size_t PrivateKeys : : FromBase64 ( const std : : string & s ) size_t PrivateKeys : : FromBase64 ( const std : : string & s )
{ {
@ -492,8 +501,8 @@ namespace data
size_t ret = FromBuffer ( buf , l ) ; size_t ret = FromBuffer ( buf , l ) ;
delete [ ] buf ; delete [ ] buf ;
return ret ; return ret ;
} }
std : : string PrivateKeys : : ToBase64 ( ) const std : : string PrivateKeys : : ToBase64 ( ) const
{ {
uint8_t * buf = new uint8_t [ GetFullLen ( ) ] ; uint8_t * buf = new uint8_t [ GetFullLen ( ) ] ;
@ -512,25 +521,25 @@ namespace data
if ( ! m_Signer ) if ( ! m_Signer )
CreateSigner ( ) ; CreateSigner ( ) ;
m_Signer - > Sign ( buf , len , signature ) ; m_Signer - > Sign ( buf , len , signature ) ;
} }
void PrivateKeys : : CreateSigner ( ) const void PrivateKeys : : CreateSigner ( ) const
{ {
if ( m_Signer ) return ; if ( m_Signer ) return ;
switch ( m_Public - > GetSigningKeyType ( ) ) switch ( m_Public - > GetSigningKeyType ( ) )
{ {
case SIGNING_KEY_TYPE_DSA_SHA1 : case SIGNING_KEY_TYPE_DSA_SHA1 :
m_Signer . reset ( new i2p : : crypto : : DSASigner ( m_SigningPrivateKey , m_Public - > GetStandardIdentity ( ) . signingKey ) ) ; m_Signer . reset ( new i2p : : crypto : : DSASigner ( m_SigningPrivateKey , m_Public - > GetStandardIdentity ( ) . signingKey ) ) ;
break ; break ;
case SIGNING_KEY_TYPE_ECDSA_SHA256_P256 : case SIGNING_KEY_TYPE_ECDSA_SHA256_P256 :
m_Signer . reset ( new i2p : : crypto : : ECDSAP256Signer ( m_SigningPrivateKey ) ) ; m_Signer . reset ( new i2p : : crypto : : ECDSAP256Signer ( m_SigningPrivateKey ) ) ;
break ; break ;
case SIGNING_KEY_TYPE_ECDSA_SHA384_P384 : case SIGNING_KEY_TYPE_ECDSA_SHA384_P384 :
m_Signer . reset ( new i2p : : crypto : : ECDSAP384Signer ( m_SigningPrivateKey ) ) ; m_Signer . reset ( new i2p : : crypto : : ECDSAP384Signer ( m_SigningPrivateKey ) ) ;
break ; break ;
case SIGNING_KEY_TYPE_ECDSA_SHA512_P521 : case SIGNING_KEY_TYPE_ECDSA_SHA512_P521 :
m_Signer . reset ( new i2p : : crypto : : ECDSAP521Signer ( m_SigningPrivateKey ) ) ; m_Signer . reset ( new i2p : : crypto : : ECDSAP521Signer ( m_SigningPrivateKey ) ) ;
break ; break ;
case SIGNING_KEY_TYPE_RSA_SHA256_2048 : case SIGNING_KEY_TYPE_RSA_SHA256_2048 :
m_Signer . reset ( new i2p : : crypto : : RSASHA2562048Signer ( m_SigningPrivateKey ) ) ; m_Signer . reset ( new i2p : : crypto : : RSASHA2562048Signer ( m_SigningPrivateKey ) ) ;
break ; break ;
@ -539,65 +548,73 @@ namespace data
break ; break ;
case SIGNING_KEY_TYPE_RSA_SHA512_4096 : case SIGNING_KEY_TYPE_RSA_SHA512_4096 :
m_Signer . reset ( new i2p : : crypto : : RSASHA5124096Signer ( m_SigningPrivateKey ) ) ; m_Signer . reset ( new i2p : : crypto : : RSASHA5124096Signer ( m_SigningPrivateKey ) ) ;
break ; break ;
case SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 : case SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 :
m_Signer . reset ( new i2p : : crypto : : EDDSA25519Signer ( m_SigningPrivateKey , m_Public - > GetStandardIdentity ( ) . certificate - i2p : : crypto : : EDDSA25519_PUBLIC_KEY_LENGTH ) ) ; m_Signer . reset ( new i2p : : crypto : : EDDSA25519Signer ( m_SigningPrivateKey , m_Public - > GetStandardIdentity ( ) . certificate - i2p : : crypto : : EDDSA25519_PUBLIC_KEY_LENGTH ) ) ;
break ; break ;
case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256 : case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256 :
case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST : case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST :
m_Signer . reset ( new i2p : : crypto : : GOSTR3410_256_Signer ( i2p : : crypto : : eGOSTR3410CryptoProA , m_SigningPrivateKey ) ) ; m_Signer . reset ( new i2p : : crypto : : GOSTR3410_256_Signer ( i2p : : crypto : : eGOSTR3410CryptoProA , m_SigningPrivateKey ) ) ;
break ; break ;
case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512 : case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512 :
case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST : case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST :
m_Signer . reset ( new i2p : : crypto : : GOSTR3410_512_Signer ( i2p : : crypto : : eGOSTR3410TC26A512 , m_SigningPrivateKey ) ) ; m_Signer . reset ( new i2p : : crypto : : GOSTR3410_512_Signer ( i2p : : crypto : : eGOSTR3410TC26A512 , m_SigningPrivateKey ) ) ;
break ; break ;
default : default :
LogPrint ( eLogError , " Identity: Signing key type " , ( int ) m_Public - > GetSigningKeyType ( ) , " is not supported " ) ; LogPrint ( eLogError , " Identity: Signing key type " , ( int ) m_Public - > GetSigningKeyType ( ) , " is not supported " ) ;
} }
} }
uint8_t * PrivateKeys : : GetPadding ( )
{
if ( m_Public - > GetSigningKeyType ( ) = = SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 )
return m_Public - > GetEncryptionPublicKeyBuffer ( ) + 256 ;
else
return nullptr ; // TODO: implement me
}
PrivateKeys PrivateKeys : : CreateRandomKeys ( SigningKeyType type ) PrivateKeys PrivateKeys : : CreateRandomKeys ( SigningKeyType type )
{ {
if ( type ! = SIGNING_KEY_TYPE_DSA_SHA1 ) if ( type ! = SIGNING_KEY_TYPE_DSA_SHA1 )
{ {
PrivateKeys keys ; PrivateKeys keys ;
// signature
// signature
uint8_t signingPublicKey [ 512 ] ; // signing public key is 512 bytes max
uint8_t signingPublicKey [ 512 ] ; // signing public key is 512 bytes max
switch ( type ) switch ( type )
{ {
case SIGNING_KEY_TYPE_ECDSA_SHA256_P256 : case SIGNING_KEY_TYPE_ECDSA_SHA256_P256 :
i2p : : crypto : : CreateECDSAP256RandomKeys ( keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateECDSAP256RandomKeys ( keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
case SIGNING_KEY_TYPE_ECDSA_SHA384_P384 : case SIGNING_KEY_TYPE_ECDSA_SHA384_P384 :
i2p : : crypto : : CreateECDSAP384RandomKeys ( keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateECDSAP384RandomKeys ( keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
case SIGNING_KEY_TYPE_ECDSA_SHA512_P521 : case SIGNING_KEY_TYPE_ECDSA_SHA512_P521 :
i2p : : crypto : : CreateECDSAP521RandomKeys ( keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateECDSAP521RandomKeys ( keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
case SIGNING_KEY_TYPE_RSA_SHA256_2048 : case SIGNING_KEY_TYPE_RSA_SHA256_2048 :
i2p : : crypto : : CreateRSARandomKeys ( i2p : : crypto : : RSASHA2562048_KEY_LENGTH , keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateRSARandomKeys ( i2p : : crypto : : RSASHA2562048_KEY_LENGTH , keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
case SIGNING_KEY_TYPE_RSA_SHA384_3072 : case SIGNING_KEY_TYPE_RSA_SHA384_3072 :
i2p : : crypto : : CreateRSARandomKeys ( i2p : : crypto : : RSASHA3843072_KEY_LENGTH , keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateRSARandomKeys ( i2p : : crypto : : RSASHA3843072_KEY_LENGTH , keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
case SIGNING_KEY_TYPE_RSA_SHA512_4096 : case SIGNING_KEY_TYPE_RSA_SHA512_4096 :
i2p : : crypto : : CreateRSARandomKeys ( i2p : : crypto : : RSASHA5124096_KEY_LENGTH , keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateRSARandomKeys ( i2p : : crypto : : RSASHA5124096_KEY_LENGTH , keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
case SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 : case SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519 :
i2p : : crypto : : CreateEDDSA25519RandomKeys ( keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateEDDSA25519RandomKeys ( keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256 : case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256 :
case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST : case SIGNING_KEY_TYPE_GOSTR3410_CRYPTO_PRO_A_GOSTR3411_256_TEST :
i2p : : crypto : : CreateGOSTR3410RandomKeys ( i2p : : crypto : : eGOSTR3410CryptoProA , keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateGOSTR3410RandomKeys ( i2p : : crypto : : eGOSTR3410CryptoProA , keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512 : case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512 :
case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST : case SIGNING_KEY_TYPE_GOSTR3410_TC26_A_512_GOSTR3411_512_TEST :
i2p : : crypto : : CreateGOSTR3410RandomKeys ( i2p : : crypto : : eGOSTR3410TC26A512 , keys . m_SigningPrivateKey , signingPublicKey ) ; i2p : : crypto : : CreateGOSTR3410RandomKeys ( i2p : : crypto : : eGOSTR3410TC26A512 , keys . m_SigningPrivateKey , signingPublicKey ) ;
break ; break ;
default : default :
LogPrint ( eLogError , " Identity: Signing key type " , ( int ) type , " is not supported. Create DSA-SHA1 " ) ; LogPrint ( eLogError , " Identity: Signing key type " , ( int ) type , " is not supported. Create DSA-SHA1 " ) ;
return PrivateKeys ( i2p : : data : : CreateRandomKeys ( ) ) ; // DSA-SHA1
return PrivateKeys ( i2p : : data : : CreateRandomKeys ( ) ) ; // DSA-SHA1
} }
// encryption
// encryption
uint8_t publicKey [ 256 ] ; uint8_t publicKey [ 256 ] ;
i2p : : crypto : : GenerateElGamalKeyPair ( keys . m_PrivateKey , publicKey ) ; i2p : : crypto : : GenerateElGamalKeyPair ( keys . m_PrivateKey , publicKey ) ;
@ -606,19 +623,19 @@ namespace data
keys . CreateSigner ( ) ; keys . CreateSigner ( ) ;
return keys ; return keys ;
} }
return PrivateKeys ( i2p : : data : : CreateRandomKeys ( ) ) ; // DSA-SHA1
return PrivateKeys ( i2p : : data : : CreateRandomKeys ( ) ) ; // DSA-SHA1
} }
Keys CreateRandomKeys ( ) Keys CreateRandomKeys ( )
{ {
Keys keys ; Keys keys ;
// encryption
// encryption
i2p : : crypto : : GenerateElGamalKeyPair ( keys . privateKey , keys . publicKey ) ; i2p : : crypto : : GenerateElGamalKeyPair ( keys . privateKey , keys . publicKey ) ;
// signing
// signing
i2p : : crypto : : CreateDSARandomKeys ( keys . signingPrivateKey , keys . signingKey ) ; i2p : : crypto : : CreateDSARandomKeys ( keys . signingPrivateKey , keys . signingKey ) ;
return keys ; return keys ;
} }
IdentHash CreateRoutingKey ( const IdentHash & ident ) IdentHash CreateRoutingKey ( const IdentHash & ident )
{ {
@ -632,26 +649,26 @@ namespace data
# else # else
gmtime_r ( & t , & tm ) ; gmtime_r ( & t , & tm ) ;
sprintf ( ( char * ) ( buf + 32 ) , " %04i%02i%02i " , tm . tm_year + 1900 , tm . tm_mon + 1 , tm . tm_mday ) ; sprintf ( ( char * ) ( buf + 32 ) , " %04i%02i%02i " , tm . tm_year + 1900 , tm . tm_mon + 1 , tm . tm_mday ) ;
# endif # endif
IdentHash key ; IdentHash key ;
SHA256 ( buf , 40 , key ) ; SHA256 ( buf , 40 , key ) ;
return key ; return key ;
} }
XORMetric operator ^ ( const IdentHash & key1 , const IdentHash & key2 ) XORMetric operator ^ ( const IdentHash & key1 , const IdentHash & key2 )
{ {
XORMetric m ; XORMetric m ;
# if defined(__AVX__) // for AVX
# if defined(__AVX__) // for AVX
__asm__ __asm__
( (
" vmovups %1, %%ymm0 \n " " vmovups %1, %%ymm0 \n "
" vmovups %2, %%ymm1 \n " " vmovups %2, %%ymm1 \n "
" vxorps %%ymm0, %%ymm1, %%ymm1 \n " " vxorps %%ymm0, %%ymm1, %%ymm1 \n "
" vmovups %%ymm1, %0 \n " " vmovups %%ymm1, %0 \n "
: " =m " ( * m . metric ) : " =m " ( * m . metric )
: " m " ( * key1 ) , " m " ( * key2 ) : " m " ( * key1 ) , " m " ( * key2 )
: " memory " , " %xmm0 " , " %xmm1 " // should be replaced by %ymm0/1 once supported by compiler
: " memory " , " %xmm0 " , " %xmm1 " // should be replaced by %ymm0/1 once supported by compiler
) ; ) ;
# else # else
const uint64_t * hash1 = key1 . GetLL ( ) , * hash2 = key2 . GetLL ( ) ; const uint64_t * hash1 = key1 . GetLL ( ) , * hash2 = key2 . GetLL ( ) ;
m . metric_ll [ 0 ] = hash1 [ 0 ] ^ hash2 [ 0 ] ; m . metric_ll [ 0 ] = hash1 [ 0 ] ^ hash2 [ 0 ] ;
@ -661,6 +678,6 @@ namespace data
# endif # endif
return m ; return m ;
} }
} }
} }
orignal
7 years ago
committed by