diff --git a/buildSrc/src/main/kotlin/ee/ria/DigiDoc/libcdoc/update/UpdateLibcdocTask.kt b/buildSrc/src/main/kotlin/ee/ria/DigiDoc/libcdoc/update/UpdateLibcdocTask.kt
index 3560f423b..8b726a383 100644
--- a/buildSrc/src/main/kotlin/ee/ria/DigiDoc/libcdoc/update/UpdateLibcdocTask.kt
+++ b/buildSrc/src/main/kotlin/ee/ria/DigiDoc/libcdoc/update/UpdateLibcdocTask.kt
@@ -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)
diff --git a/crypto-lib/libs/libcdoc.jar b/crypto-lib/libs/libcdoc.jar
index caf826337..8bab50b1a 100644
Binary files a/crypto-lib/libs/libcdoc.jar and b/crypto-lib/libs/libcdoc.jar differ
diff --git a/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so
index e7698e7bb..afede327b 100644
Binary files a/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so differ
diff --git a/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so
index f3ab39942..01bdcb30a 100644
Binary files a/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so differ
diff --git a/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so
index a6de9db61..cc889a6f0 100644
Binary files a/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so b/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so
index e7698e7bb..afede327b 100644
Binary files a/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so b/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so
index f3ab39942..01bdcb30a 100644
Binary files a/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so b/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so
index a6de9db61..cc889a6f0 100644
Binary files a/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt
index 32ce1500c..ad07beb25 100644
--- a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt
+++ b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/Addressee.kt
@@ -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
diff --git a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
index e9e5fdbe1..8519f9703 100644
--- a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
+++ b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
@@ -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
@@ -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)
@@ -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,