lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

found TODO while patching android

Browse source
This commit is contained in:
Jakub 2019-05-10 08:08:03 +02:00
parent 56a73b1532
commit 532ce66247
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crypto/key.go
View file

@ -456,8 +456,8 @@ func (pm *PmCrypto) GenerateRSAKeyWithPrimes(
return pm.generateKey(userName, domain, passphrase, "rsa", bits, primeone, primetwo, primethree, primefour) return pm.generateKey(userName, domain, passphrase, "rsa", bits, primeone, primetwo, primethree, primefour)
} }
// GenerateKey ... // GenerateKey and generate primes
// TODO: is it really disabled // TODO: is it really disabled -> no this is used by android
// disabled now, will enable later // disabled now, will enable later
// #generat new key with email address. Fix the UserID issue in protonmail system. on Feb 28, 17 // #generat new key with email address. Fix the UserID issue in protonmail system. on Feb 28, 17
// #static generate_key_with_email(email : string, passphrase : string, bits : i32) : open_pgp_key; // #static generate_key_with_email(email : string, passphrase : string, bits : i32) : open_pgp_key;

4
crypto/keyring.go
View file

@ -503,7 +503,7 @@ func (kr *KeyRing) readFrom(r io.Reader, armored bool) error {
switch entity.PrivateKey.PrivateKey.(type) { switch entity.PrivateKey.PrivateKey.(type) {
// TODO: type mismatch after crypto lib update, fix this: // TODO: type mismatch after crypto lib update, fix this:
case *rsa.PrivateKey: case *rsa.PrivateKey:
//entity.PrimaryKey = packet.NewRSAPublicKey(time.Now(), entity.PrivateKey.PrivateKey.(*rsa.PrivateKey).Public().(*rsa.PublicKey)) entity.PrimaryKey = packet.NewRSAPublicKey(time.Now(), entity.PrivateKey.PrivateKey.(*rsa.PrivateKey).Public().(*rsa.PublicKey))
case *ecdsa.PrivateKey: case *ecdsa.PrivateKey:
entity.PrimaryKey = packet.NewECDSAPublicKey(time.Now(), entity.PrivateKey.PrivateKey.(*ecdsa.PrivateKey).Public().(*ecdsa.PublicKey)) entity.PrimaryKey = packet.NewECDSAPublicKey(time.Now(), entity.PrivateKey.PrivateKey.(*ecdsa.PrivateKey).Public().(*ecdsa.PublicKey))
} }
@ -512,7 +512,7 @@ func (kr *KeyRing) readFrom(r io.Reader, armored bool) error {
if subkey.PrivateKey != nil { if subkey.PrivateKey != nil {
switch subkey.PrivateKey.PrivateKey.(type) { switch subkey.PrivateKey.PrivateKey.(type) {
case *rsa.PrivateKey: case *rsa.PrivateKey:
//subkey.PublicKey = packet.NewRSAPublicKey(time.Now(), subkey.PrivateKey.PrivateKey.(*rsa.PrivateKey).Public().(*rsa.PublicKey)) subkey.PublicKey = packet.NewRSAPublicKey(time.Now(), subkey.PrivateKey.PrivateKey.(*rsa.PrivateKey).Public().(*rsa.PublicKey))
case *ecdsa.PrivateKey: case *ecdsa.PrivateKey:
subkey.PublicKey = packet.NewECDSAPublicKey(time.Now(), subkey.PrivateKey.PrivateKey.(*ecdsa.PrivateKey).Public().(*ecdsa.PublicKey)) subkey.PublicKey = packet.NewECDSAPublicKey(time.Now(), subkey.PrivateKey.PrivateKey.(*ecdsa.PrivateKey).Public().(*ecdsa.PublicKey))
} }