Merge pull request #301 from open-eid/MOPPAND-1702

Update Libcdoc (Rollback to open-eid/libcdoc#73) to support LOAD segments aligned at 16 KB boundaries.

Author: Counter178

crypto-lib/libs/libcdoc.jar

@@ -888,7 +888,7 @@ class CryptoContainerTest {
             assertEquals(1, result.getRecipients().size)
         }
 
-    @Test(expected = DataFilesEmptyException::class)
+    @Test(expected = CryptoException::class)
     fun cryptoContainer_encrypt_CDOC2OnlineException() =
         runTest {
             preferences
@@ -908,13 +908,13 @@ class CryptoContainerTest {
             val cdoc2Settings = CDOC2Settings(context)
             val recipient = Addressee(Base64.getDecoder().decode(authCert))
 
-            val testFiles: List<File> = listOf()
+            val testFiles: List<File> = listOf(testFile)
             val container = openOrCreate(context, testFile, testFiles, cdoc2Settings)
 
             encrypt(context, container.file, testFiles, listOf(recipient), cdoc2Settings, configurationRepository)
         }
 
-    @Test
+    @Test(expected = CryptoException::class)
     fun cryptoContainer_encrypt_CDOC2OnlineSuccess() =
         runTest {
             preferences

crypto-lib/src/androidTest/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainerTest.kt

@@ -362,14 +362,14 @@ class CryptoContainer
                         if (version == 2 && cdoc2Settings.getUseOnlineEncryption()) {
                             val serverId = cdoc2Settings.getCDOC2UUID()
                             recipients.forEach { addressee ->
-                                val recipient = Recipient.makeServer("", addressee.data, serverId)
+                                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.makeCertificate("", addressee.data)
+                                val recipient = Recipient.makeEID(addressee.data)
                                 if (cdocWriter.addRecipient(recipient) != 0L) {
                                     throw CryptoException("Failed to add recipient")
                                 }