Skip to content

Optimizations, cleanups and fixes for libcdoc library: open-eid/libcdoc#73. #271

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

Merged
ambrose40 merged 1 commit into from
Sep 11, 2025
Merged

Optimizations, cleanups and fixes for libcdoc library: open-eid/libcdoc#73. #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified crypto-lib/libs/libcdoc.jar
View file
Open in desktop
Binary file not shown.
Binary file modified crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so
View file
Open in desktop
Binary file not shown.
Binary file modified crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so
View file
Open in desktop
Binary file not shown.
Binary file modified crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so
View file
Open in desktop
Binary file not shown.
Binary file modified crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so
View file
Open in desktop
Binary file not shown.
Binary file modified crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so
View file
Open in desktop
Binary file not shown.
Binary file modified crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so
View file
Open in desktop
Binary file not shown.
38 changes: 19 additions & 19 deletions crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,30 +348,30 @@ class CryptoContainer
}

val cdocWriter = CDocWriter.createWriter(version, file?.path, conf, null, network)
withContext(IO) {
if (version == 2 && cdoc2Settings.getUseOnlineEncryption()) {
val serverId = cdoc2Settings.getCDOC2UUID()
recipients.forEach { addressee ->
val recipient = Recipient.makeEIDServer(addressee?.data, serverId)
if (cdocWriter.addRecipient(recipient) != 0L) {
throw CryptoException("Failed to add recipient")
}
}
} else {
recipients.forEach { addressee ->
val recipient = Recipient.makeEID(addressee?.data)
if (cdocWriter.addRecipient(recipient) != 0L) {
throw CryptoException("Failed to add recipient")
}
}
}
}

try {
if (cdocWriter.beginEncryption() != 0L) {
throw CryptoException("Failed to begin encryption")
}

withContext(IO) {
if (version == 2 && cdoc2Settings.getUseOnlineEncryption()) {
val serverId = cdoc2Settings.getCDOC2UUID()
recipients.forEach { addressee ->
val recipient = Recipient.makeEIDServer(addressee?.data, serverId)
if (cdocWriter.addRecipient(recipient) != 0L) {
throw CryptoException("Failed to add recipient")
}
}
} else {
recipients.forEach { addressee ->
val recipient = Recipient.makeEID(addressee?.data)
if (cdocWriter.addRecipient(recipient) != 0L) {
throw CryptoException("Failed to add recipient")
}
}
}
}

withContext(IO) {
dataFiles.forEach { dataFile ->
val ifs: InputStream = FileInputStream(dataFile)
Expand Down