Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix AES256Encrypt Bug in OSX #2742

Merged
merged 6 commits into from
May 20, 2022
Merged

Fix AES256Encrypt Bug in OSX #2742

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b45acf5
Support OSX
doubiliu May 19, 2022
e578ec8
Merge branch 'master' into Fix-AES256-IOSX
doubiliu May 19, 2022
6900a09
Update main.yml
erikzhang May 20, 2022
5d8768b
Add native lib
doubiliu May 20, 2022
754bf7f
Merge branch 'Fix-AES256-IOSX' of github.com:neo-ngd/neo into Fix-AES…
doubiliu May 20, 2022
25a3a71
Fix bug
doubiliu May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions src/neo/Cryptography/Helper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
using Neo.IO;
using Neo.Network.P2P.Payloads;
using Neo.Wallets;
using Org.BouncyCastle.Crypto.Engines;
using Org.BouncyCastle.Crypto.Modes;
using Org.BouncyCastle.Crypto.Parameters;
using System;
using System.Buffers.Binary;
using System.Linq;
Expand Down Expand Up @@ -136,11 +139,18 @@ public static byte[] Sha256(this Span<byte> value)
public static byte[] AES256Encrypt(this byte[] plainData, byte[] key, byte[] nonce, byte[] associatedData = null)
{
if (nonce.Length != 12) throw new ArgumentOutOfRangeException(nameof(nonce));
var cipherBytes = new byte[plainData.Length];
var tag = new byte[16];
using var cipher = new AesGcm(key);
cipher.Encrypt(nonce, plainData, cipherBytes, tag, associatedData);
return Concat(nonce, cipherBytes, tag);
var cipher = new GcmBlockCipher(new AesEngine());
var parameters = new AeadParameters(
new KeyParameter(key),
128, //128 = 16 * 8 => (tag size * 8)
nonce,
associatedData);
cipher.Init(true, parameters);
var cipherData = new byte[cipher.GetOutputSize(plainData.Length)];
var length = cipher.ProcessBytes(plainData, 0, plainData.Length, cipherData, 0);
cipher.DoFinal(cipherData, length);
return Concat(nonce, cipherData, tag);
}

public static byte[] AES256Decrypt(this byte[] encryptedData, byte[] key, byte[] associatedData = null)
Expand All @@ -149,9 +159,16 @@ public static byte[] AES256Decrypt(this byte[] encryptedData, byte[] key, byte[]
var nonce = encrypted[..12];
var cipherBytes = encrypted[12..^16];
var tag = encrypted[^16..];
var decryptedData = new byte[cipherBytes.Length];
using var cipher = new AesGcm(key);
cipher.Decrypt(nonce, cipherBytes, tag, decryptedData, associatedData);
var cipher = new GcmBlockCipher(new AesEngine());
var parameters = new AeadParameters(
new KeyParameter(key),
128, //128 = 16 * 8 => (tag size * 8)
nonce.ToArray(),
associatedData);
cipher.Init(false, parameters);
var decryptedData = new byte[cipher.GetOutputSize(cipherBytes.Length)];
var length = cipher.ProcessBytes(cipherBytes.ToArray(), 0, cipherBytes.Length, decryptedData, 0);
cipher.DoFinal(decryptedData, length);
return decryptedData;
}

Expand Down