Skip to content

Update libcdoc #350

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

Open
martenrebane wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update libcdoc #350

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 buildSrc/src/main/kotlin/ee/ria/DigiDoc/libcdoc/update/UpdateLibcdocTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ open class UpdateLibcdocTask : DefaultTask() {

log("Updating from $zipFile")
val cacheDir = File(outputDir, PREFIX + ABI_FILES[abi])
unzip(zipFile, cacheDir)
unzip(zipFile, outputDir)

generateAndCopyJar(cacheDir)
copyNativeLibraries(cacheDir, abi)
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.
2 changes: 1 addition & 1 deletion crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

package ee.ria.DigiDoc.cryptolib

import ee.ria.cdoc.Recipient.parseLabel
import ee.ria.cdoc.Lock.parseLabel
import org.bouncycastle.asn1.ASN1InputStream
import org.bouncycastle.asn1.ASN1OctetString
import org.bouncycastle.asn1.ASN1Sequence
Expand Down
22 changes: 8 additions & 14 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 @@ -51,8 +51,9 @@ import ee.ria.cdoc.Configuration
import ee.ria.cdoc.CryptoBackend
import ee.ria.cdoc.DataBuffer
import ee.ria.cdoc.FileInfo
import ee.ria.cdoc.ILogger
import ee.ria.cdoc.Logger
import ee.ria.cdoc.Lock
import ee.ria.cdoc.LogLevel
import ee.ria.cdoc.NetworkBackend
import ee.ria.cdoc.Recipient
import kotlinx.coroutines.Dispatchers.IO
Expand Down Expand Up @@ -183,7 +184,7 @@ class CryptoContainer

withContext(IO) {
cdocReader.locks.forEach { lock ->
if (lock.isCertificate) {
if (lock.isCDoc1) {
var concatKDFAlgorithmURI = ""
if (!lock.isRSA) {
concatKDFAlgorithmURI = lock.getString(Lock.Params.CONCAT_DIGEST)
Expand Down Expand Up @@ -498,24 +499,17 @@ class CryptoContainer

fun setLogging(isLoggingEnabled: Boolean) {
if (isLoggingEnabled) {
logger.SetMinLogLevel(ILogger.LogLevel.LEVEL_TRACE)
logger.setMinLogLevel(LogLevel.LEVEL_TRACE)
if (!loggingIsSet) {
ILogger.addLogger(logger)
CDoc.setLogger(logger)
loggingIsSet = true
}
val lgr = ILogger.getLogger()

lgr.LogMessage(
ILogger.LogLevel.LEVEL_DEBUG,
"CryptoContainer",
450,
"Set libcdoc logging: true",
)
CDoc.log(LogLevel.LEVEL_DEBUG, "CryptoContainer", 450, "Set libcdoc logging: true")
}
}

class JavaLogger : ILogger() {
override fun LogMessage(
class JavaLogger : Logger() {
override fun logMessage(
level: LogLevel?,
file: String?,
line: Int,
Expand Down
Loading