Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class SendCSRRemoteOperationIT : AbstractIT() {
val keyPair = keyGen.genKeyPair()

// create CSR
val urlEncoded: String = CsrHelper().generateCsrPemEncodedString(keyPair, client.userId)
val urlEncoded: String =
CsrHelper().generateCsrPemEncodedString(keyPair, client.userId)

val operation = SendCSRRemoteOperation(urlEncoded)
var result = operation.execute(nextcloudClient)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,14 @@ class CsrHelper {
userId: String
): PKCS10CertificationRequest {
val principal = "CN=$userId"

val privateKey = PrivateKeyFactory.createKey(keyPair.private.encoded)
val signatureAlgorithm = DefaultSignatureAlgorithmIdentifierFinder().find("SHA1WITHRSA")
val digestAlgorithm = DefaultDigestAlgorithmIdentifierFinder().find("SHA-1")
val signatureAlgorithm = SignatureAlgorithm.SHA256
val signatureAlgorithmIdentifier =
DefaultSignatureAlgorithmIdentifierFinder().find(signatureAlgorithm.signatureAlg)
val digestAlgorithmIdentifier = DefaultDigestAlgorithmIdentifierFinder().find(signatureAlgorithm.digestAlg)
val signer =
BcRSAContentSignerBuilder(signatureAlgorithm, digestAlgorithm).build(privateKey)
BcRSAContentSignerBuilder(signatureAlgorithmIdentifier, digestAlgorithmIdentifier).build(privateKey)
val csrBuilder: PKCS10CertificationRequestBuilder =
JcaPKCS10CertificationRequestBuilder(
X500Name(principal),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Nextcloud Android Library
*
* SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
* SPDX-License-Identifier: MIT
*/

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

enum class SignatureAlgorithm(
val signatureAlg: String,
val digestAlg: String
) {
SHA256("SHA256WITHRSAENCRYPTION", "SHA-256")
}
Loading