Skip to content

Commit

Permalink
Tag All Assembly Blocks as Memory-Safe
Browse files Browse the repository at this point in the history
  • Loading branch information
@nlordell
nlordell committed Jan 15, 2024
1 parent d9bb3b0 commit 92d69aa
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions solidity/src/FCL_Webauthn.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ library FCL_WebAuthn {
bytes(challengeEncoded).length
);

assembly {
assembly ("memory-safe") {
calldatacopy(
add(challengeExtracted, 32),
add(clientData.offset, clientChallengeDataOffset),
Expand All @@ -60,7 +60,7 @@ library FCL_WebAuthn {
}

bytes32 moreData; //=keccak256(abi.encodePacked(challengeExtracted));
assembly {
assembly ("memory-safe") {
moreData := keccak256(add(challengeExtracted, 32), mload(challengeExtracted))
}

Expand All @@ -72,12 +72,12 @@ library FCL_WebAuthn {
// Verify the signature over sha256(authenticatorData || sha256(clientData))
bytes memory verifyData = new bytes(authenticatorData.length + 32);

assembly {
assembly ("memory-safe") {
calldatacopy(add(verifyData, 32), authenticatorData.offset, authenticatorData.length)
}

bytes32 more = sha256(clientData);
assembly {
assembly ("memory-safe") {
mstore(add(verifyData, add(authenticatorData.length, 32)), more)
}

Expand Down
8 changes: 4 additions & 4 deletions solidity/src/FCL_edwards.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ library Edwards {
returns (uint256 x3, uint256 y3, uint256 z3, uint256 t3)
{
unchecked {
assembly {
assembly ("memory-safe") {
x3 := addmod(y1, sub(p, x1), p) // = (Y1-X1)
t3 := addmod(y2, sub(p, x2), p) // (Y2-X2)

Expand Down Expand Up @@ -106,7 +106,7 @@ library Edwards {
returns (uint256 x3, uint256 y3, uint256 z3, uint256 t3)
{
unchecked {
assembly {
assembly ("memory-safe") {
x3 := addmod(y1, sub(p, x1), p) // = (Y1-X1)
t3 := addmod(y2, sub(p, x2), p) // (Y2-X2)

Expand Down Expand Up @@ -135,7 +135,7 @@ library Edwards {
returns (uint256 x3, uint256 y3, uint256 z3, uint256 t3)
{
unchecked {
assembly {
assembly ("memory-safe") {
x3 := mulmod(x1, x1, p) //A = X1^2
t3 := mulmod(y1, y1, p) //B = Y1^2
let P6 := addmod(x3, t3, p) //H=B+A
Expand Down Expand Up @@ -186,7 +186,7 @@ library Edwards {

(T[0], T[1]) = ed_AddAff(gx, gy, Q0, Q1);

assembly {
assembly ("memory-safe") {
for { let T4 := add(shl(1, and(shr(index, scalar_v), 1)), and(shr(index, scalar_u), 1)) } eq(T4, 0) {
index := sub(index, 1)
T4 := add(shl(1, and(shr(index, scalar_v), 1)), and(shr(index, scalar_u), 1))
Expand Down
18 changes: 9 additions & 9 deletions solidity/src/FCL_elliptic.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ library FCL_Elliptic_ZZ {
* /* inversion mod n via a^(n-2), use of precompiled using little Fermat theorem
*/
function FCL_nModInv(uint256 u) internal view returns (uint256 result) {
assembly {
assembly ("memory-safe") {
let pointer := mload(0x40)
// Define length of base, exponent and modulus. 0x20 == 32 bytes
mstore(pointer, 0x20)
Expand All @@ -74,7 +74,7 @@ library FCL_Elliptic_ZZ {
*/

function FCL_pModInv(uint256 u) internal view returns (uint256 result) {
assembly {
assembly ("memory-safe") {
let pointer := mload(0x40)
// Define length of base, exponent and modulus. 0x20 == 32 bytes
mstore(pointer, 0x20)
Expand Down Expand Up @@ -224,7 +224,7 @@ function SqrtMod(uint256 self) internal view returns (uint256 result){
returns (uint256 P0, uint256 P1, uint256 P2, uint256 P3)
{
unchecked {
assembly {
assembly ("memory-safe") {
P0 := mulmod(2, y, p) //U = 2*Y1
P2 := mulmod(P0, P0, p) // V=U^2
P3 := mulmod(x, P2, p) // S = X1*V
Expand Down Expand Up @@ -255,7 +255,7 @@ function SqrtMod(uint256 self) internal view returns (uint256 result){
return (x2, y2, 1, 1);
}

assembly {
assembly ("memory-safe") {
y1 := sub(p, y1)
y2 := addmod(mulmod(y2, zzz1, p), y1, p)
x2 := addmod(mulmod(x2, zz1, p), sub(p, x1), p)
Expand Down Expand Up @@ -365,7 +365,7 @@ function SqrtMod(uint256 self) internal view returns (uint256 result){
scalar_v=0;

}
assembly {
assembly ("memory-safe") {
for { let T4 := add(shl(1, and(shr(index, scalar_v), 1)), and(shr(index, scalar_u), 1)) } eq(T4, 0) {
index := sub(index, 1)
T4 := add(shl(1, and(shr(index, scalar_v), 1)), and(shr(index, scalar_u), 1))
Expand Down Expand Up @@ -521,7 +521,7 @@ function SqrtMod(uint256 self) internal view returns (uint256 result){

(H[0], H[1]) = ecAff_add(gx, gy, Q0, Q1); //will not work if Q=P, obvious forbidden private key

assembly {
assembly ("memory-safe") {
for { let T4 := add(shl(1, and(shr(index, scalar_v), 1)), and(shr(index, scalar_u), 1)) } eq(T4, 0) {
index := sub(index, 1)
T4 := add(shl(1, and(shr(index, scalar_v), 1)), and(shr(index, scalar_u), 1))
Expand Down Expand Up @@ -679,7 +679,7 @@ function SqrtMod(uint256 self) internal view returns (uint256 result){
+ 2 * ((scalar_u >> (zz - 128)) & 1) + ((scalar_u >> (zz - 192)) & 1)
);
}
assembly {
assembly ("memory-safe") {
extcodecopy(dataPointer, T, mload(T), 64)
let index := sub(zz, 1)
X := mload(T)
Expand Down Expand Up @@ -824,7 +824,7 @@ function SqrtMod(uint256 self) internal view returns (uint256 result){
+ 2 * ((scalar_u >> (zz - 128)) & 1) + ((scalar_u >> (zz - 192)) & 1)
);
}
assembly {
assembly ("memory-safe") {
codecopy(T, add(mload(T), dataPointer), 64)
X := mload(T)
let Y := mload(add(T, 32))
Expand Down Expand Up @@ -938,7 +938,7 @@ function SqrtMod(uint256 self) internal view returns (uint256 result){
//Shamir 8 dimensions
X = ecZZ_mulmuladd_S8_hackmem(mulmod(uint256(message), sInv, n), mulmod(r, sInv, n), endcontract);

assembly {
assembly ("memory-safe") {
X := addmod(X, sub(n, r), n)
}
return X == 0;
Expand Down
10 changes: 5 additions & 5 deletions solidity/src/FCL_sha512.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ library sha512 {
function k512(uint j) internal view returns (uint64 r)
{
uint256[1] memory T;
assembly{
extcodecopy(0xcaca, T, mul(j,8), 8)
}
assembly ("memory-safe") {
extcodecopy(0xcaca, T, mul(j,8), 8)
}
r=uint64(T[0]>>192);

return r;
Expand Down Expand Up @@ -284,7 +284,7 @@ function SHA512(uint64[16] memory data) internal view returns(uint256 low, uint2
unchecked{
do {

assembly{
assembly ("memory-safe") {
let T1:= mload(add(data,mul(32,j))) // buffer[j] =T1= (data[j]);

mstore(add(buffer, mul(32,j)), T1)
Expand Down Expand Up @@ -318,7 +318,7 @@ assembly{
/* Part of the message block expansion: */
//uint64 T1 = buffer[(j + 1) & 0x0f];
uint64 T1;uint64 T2;
assembly{
assembly ("memory-safe") {
T1:= mload(add(buffer, mul(32,and(0x0f, add(j,1)))))
T1:= xor(xor( or(shr(1,T1), shl(63,T1)) , or(shr(8,T1), shl(56,T1))), shr(7,T1) )
T2:=mload(add(buffer, mul(32,and(0x0f, add(j,14)))))
Expand Down
2 changes: 1 addition & 1 deletion solidity/src/utils/Base64Url.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ library Base64Url {
string memory result = new string(4 * ((data.length + 2) / 3));

// @solidity memory-safe-assembly
assembly {
assembly ("memory-safe") {
let tablePtr := add(table, 1)
let resultPtr := add(result, 32)

Expand Down

0 comments on commit 92d69aa

Please sign in to comment.