Skip to content

Fix CDOC1 decryption open-eid/libcdoc#67. #245

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
Aug 5, 2025
Merged

Fix CDOC1 decryption open-eid/libcdoc#67. #245

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
2 changes: 1 addition & 1 deletion app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/IdCardViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class IdCardViewModel
logTag,
"Auth certificate: " + Base64.toBase64String(authCert),
)
var decryptedContainer =
val decryptedContainer =
CryptoContainer.decrypt(
context,
container.file,
Expand Down
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.
6 changes: 5 additions & 1 deletion 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 @@ -35,6 +35,7 @@ import ee.ria.cdoc.CryptoBackend
import ee.ria.cdoc.DataBuffer
import ee.ria.cdoc.FileInfo
import ee.ria.cdoc.ILogger
import ee.ria.cdoc.IStreamSource
import ee.ria.cdoc.Lock
import ee.ria.cdoc.NetworkBackend
import ee.ria.cdoc.Recipient
Expand Down Expand Up @@ -264,7 +265,10 @@ class CryptoContainer
val network = CryptoLibNetworkBackend(cdoc2Settings, configurationProvider, context, authCert, token)
val dataFiles = ArrayList<File>()

val cdocReader = CDocReader.createReader(file?.path, conf, token, network)
val src = IStreamSource(FileInputStream(file))
val cdocReader = CDocReader.createReader(src, false, conf, token, network)

debugLog(LOG_TAG, "Reader created: (version ${cdocReader.version})")
val idx = cdocReader.getLockForCert(authCert)

if (idx < 0) {
Expand Down