Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Fix mobile SRP fixed-width encoding

laurenspriema568e79faaf2
diff --git a/mobile/apps/photos/lib/emergency/emergency_service.dart b/mobile/apps/photos/lib/emergency/emergency_service.dart
index d877f3903a..749e2469b5 100644
--- a/mobile/apps/photos/lib/emergency/emergency_service.dart
+++ b/mobile/apps/photos/lib/emergency/emergency_service.dart
@@ -235,7 +235,7 @@ class EmergencyContactService {
srpUserID: username,
srpSalt: base64Encode(salt),
srpVerifier: base64Encode(SRP6Util.encodeBigInt(v)),
- srpA: base64Encode(SRP6Util.encodeBigInt(A!)),
+ srpA: base64Encode(SRP6Util.getPadded(A!, 512)),
isUpdate: false,
);
final setupSRPResponse = await _gateway.initPasswordChange(
@@ -252,7 +252,7 @@ class EmergencyContactService {
await _gateway.changePassword(
recoveryID: recoverySessions.id,
setupID: setupSRPResponse.setupID,
- srpM1: base64Encode(SRP6Util.encodeBigInt(clientM!)),
+ srpM1: base64Encode(SRP6Util.getPadded(clientM!, 32)),
updatedKeyAttr: setKeysRequest.toMap(),
);
} catch (e, s) {
diff --git a/mobile/apps/photos/lib/services/account/user_service.dart b/mobile/apps/photos/lib/services/account/user_service.dart
index 18810df823..502fe7f1be 100644
--- a/mobile/apps/photos/lib/services/account/user_service.dart
+++ b/mobile/apps/photos/lib/services/account/user_service.dart
@@ -590,7 +590,7 @@ class UserService {
srpUserID: username,
srpSalt: base64Encode(salt),
srpVerifier: base64Encode(SRP6Util.encodeBigInt(v)),
- srpA: base64Encode(SRP6Util.encodeBigInt(A!)),
+ srpA: base64Encode(SRP6Util.getPadded(A!, 512)),
isUpdate: false,
);
final setupSRPResponse = await _gateway.setupSrp(request);
@@ -603,12 +603,12 @@ class UserService {
if (setKeysRequest == null) {
await _gateway.completeSrp(
setupID: setupSRPResponse.setupID,
- srpM1: base64Encode(SRP6Util.encodeBigInt(clientM!)),
+ srpM1: base64Encode(SRP6Util.getPadded(clientM!, 32)),
);
} else {
await _gateway.updateSrp(
setupID: setupSRPResponse.setupID,
- srpM1: base64Encode(SRP6Util.encodeBigInt(clientM!)),
+ srpM1: base64Encode(SRP6Util.getPadded(clientM!, 32)),
updatedKeyAttr: setKeysRequest.toMap(),
logOutOtherDevices: logOutOtherDevices,
);
diff --git a/mobile/packages/accounts/lib/services/user_service.dart b/mobile/packages/accounts/lib/services/user_service.dart
index 9ba2d3e8cd..71909ea4b3 100644
--- a/mobile/packages/accounts/lib/services/user_service.dart
+++ b/mobile/packages/accounts/lib/services/user_service.dart
@@ -655,7 +655,7 @@ class UserService {
srpUserID: username,
srpSalt: base64Encode(salt),
srpVerifier: base64Encode(SRP6Util.encodeBigInt(v)),
- srpA: base64Encode(SRP6Util.encodeBigInt(A!)),
+ srpA: base64Encode(SRP6Util.getPadded(A!, 512)),
isUpdate: false,
);
final response = await _enteDio.post(
@@ -678,7 +678,7 @@ class UserService {
"/users/srp/complete",
data: {
'setupID': setupSRPResponse.setupID,
- 'srpM1': base64Encode(SRP6Util.encodeBigInt(clientM!)),
+ 'srpM1': base64Encode(SRP6Util.getPadded(clientM!, 32)),
},
);
} else {
@@ -686,7 +686,7 @@ class UserService {
"/users/srp/update",
data: {
'setupID': setupSRPResponse.setupID,
- 'srpM1': base64Encode(SRP6Util.encodeBigInt(clientM!)),
+ 'srpM1': base64Encode(SRP6Util.getPadded(clientM!, 32)),
'updatedKeyAttr': setKeysRequest.toMap(),
'logOutOtherDevices': logOutOtherDevices,
},
diff --git a/mobile/packages/legacy/lib/services/emergency_service.dart b/mobile/packages/legacy/lib/services/emergency_service.dart
index c2aff22f9b..f83815f6ab 100644
--- a/mobile/packages/legacy/lib/services/emergency_service.dart
+++ b/mobile/packages/legacy/lib/services/emergency_service.dart
@@ -279,7 +279,7 @@ class EmergencyContactService {
srpUserID: username,
srpSalt: base64Encode(salt),
srpVerifier: base64Encode(SRP6Util.encodeBigInt(v)),
- srpA: base64Encode(SRP6Util.encodeBigInt(A!)),
+ srpA: base64Encode(SRP6Util.getPadded(A!, 512)),
isUpdate: false,
);
final response = await _enteDio.post(
@@ -308,7 +308,7 @@ class EmergencyContactService {
"recoveryID": recoverySessions.id,
'updateSrpAndKeysRequest': {
'setupID': setupSRPResponse.setupID,
- 'srpM1': base64Encode(SRP6Util.encodeBigInt(clientM!)),
+ 'srpM1': base64Encode(SRP6Util.getPadded(clientM!, 32)),
'updatedKeyAttr': setKeysRequest.toMap(),
},
},