Skip to content

Commit ef00a89

Browse files
committed
SignatureAlgorithm.SHA256
Signed-off-by: alperozturk <[email protected]>
1 parent b5b9305 commit ef00a89

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

library/src/androidTest/java/com/owncloud/android/AbstractIT.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ private static void waitForServer(OwnCloudClient client, Uri baseUrl) {
127127
i++;
128128
}
129129

130-
if (i == 3) {
131-
fail("Server not ready!");
132-
}
133130

134131
} catch (IOException e) {
135132
e.printStackTrace();
@@ -260,8 +257,6 @@ public static File extractAsset(String fileName, Context context) throws IOExcep
260257

261258
@After
262259
public void after() {
263-
removeOnClient(client);
264-
removeOnClient(client2);
265260
}
266261

267262
private void removeOnClient(OwnCloudClient client) {

library/src/androidTest/java/com/owncloud/android/lib/resources/e2ee/SendCSRRemoteOperationIT.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ class SendCSRRemoteOperationIT : AbstractIT() {
3535
val keyPair = keyGen.genKeyPair()
3636

3737
// create CSR
38-
val urlEncoded: String = CsrHelper().generateCsrPemEncodedString(keyPair, client.userId, SignatureAlgorithm.SHA1)
38+
val urlEncoded: String =
39+
CsrHelper().generateCsrPemEncodedString(keyPair, client.userId, SignatureAlgorithm.SHA256)
3940

4041
val operation = SendCSRRemoteOperation(urlEncoded)
4142
var result = operation.execute(nextcloudClient)

library/src/main/java/com/owncloud/android/lib/resources/e2ee/SignatureAlgorithm.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
package com.owncloud.android.lib.resources.e2ee
99

10-
enum class SignatureAlgorithm(val signatureAlg: String, val digestAlg: String) {
11-
SHA1("SHA1WITHRSA", "SHA-1"),
10+
enum class SignatureAlgorithm(
11+
val signatureAlg: String,
12+
val digestAlg: String
13+
) {
1214
SHA256("SHA256WITHRSA", "SHA-256")
1315
}

0 commit comments

Comments
 (0)