Removed some extra check from parsing

Lauris Kaplinski · Lauris Kaplinski · commit 777700cc6b79 · 2026-02-02T17:15:55.000+02:00
diff --git a/cdoc/CDoc2Reader.cpp b/cdoc/CDoc2Reader.cpp
@@ -539,29 +539,21 @@ CDoc2Reader::Private::buildLock(Lock& lock, const cdoc20::header::RecipientRecor
                     }
                     lock.pk_type = Lock::PKType::ECC;
                     lock.setBytes(Lock::Params::RCPT_KEY, toUint8Vector(eccDetails->recipient_public_key()));
-                } else {
-                    LOG_ERROR("Invalid file format");
-                    return;
                 }
                 break;
             case KeyDetailsUnion::RsaKeyDetails:
                 if(const RsaKeyDetails *rsaDetails = server->recipient_key_details_as_RsaKeyDetails()) {
                     lock.pk_type = Lock::PKType::RSA;
                     lock.setBytes(Lock::Params::RCPT_KEY, toUint8Vector(rsaDetails->recipient_public_key()));
-                } else {
-                    LOG_ERROR("Invalid file format");
-                    return;
                 }
                 break;
             default:
-                LOG_ERROR("Unsupported Key Server Details: skipping");
+                LOG_ERROR("Unsupported Key Server Details");
                 return;
             }
             lock.type = Lock::Type::SERVER;
             lock.setString(Lock::Params::KEYSERVER_ID, server->keyserver_id()->str());
             lock.setString(Lock::Params::TRANSACTION_ID, server->transaction_id()->str());
-        } else {
-            LOG_ERROR("Invalid file format");
         }
         return;
     case Capsule::recipients_SymmetricKeyCapsule:
@@ -616,7 +608,7 @@ CDoc2Reader::Private::buildLock(Lock& lock, const cdoc20::header::RecipientRecor
         }
         return;
     default:
-        LOG_ERROR("Unsupported Key Details: skipping");
+        LOG_ERROR("Unsupported capsule type");
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -539,29 +539,21 @@ CDoc2Reader::Private::buildLock(Lock& lock, const cdoc20::header::RecipientRecor`
`539`	`539`	`}`
`540`	`540`	`lock.pk_type = Lock::PKType::ECC;`
`541`	`541`	`lock.setBytes(Lock::Params::RCPT_KEY, toUint8Vector(eccDetails->recipient_public_key()));`
`542`		`- } else {`
`543`		`- LOG_ERROR("Invalid file format");`
`544`		`- return;`
`545`	`542`	`}`
`546`	`543`	`break;`
`547`	`544`	`case KeyDetailsUnion::RsaKeyDetails:`
`548`	`545`	`if(const RsaKeyDetails *rsaDetails = server->recipient_key_details_as_RsaKeyDetails()) {`
`549`	`546`	`lock.pk_type = Lock::PKType::RSA;`
`550`	`547`	`lock.setBytes(Lock::Params::RCPT_KEY, toUint8Vector(rsaDetails->recipient_public_key()));`
`551`		`- } else {`
`552`		`- LOG_ERROR("Invalid file format");`
`553`		`- return;`
`554`	`548`	`}`
`555`	`549`	`break;`
`556`	`550`	`default:`
`557`		`- LOG_ERROR("Unsupported Key Server Details: skipping");`
	`551`	`+ LOG_ERROR("Unsupported Key Server Details");`
`558`	`552`	`return;`
`559`	`553`	`}`
`560`	`554`	`lock.type = Lock::Type::SERVER;`
`561`	`555`	`lock.setString(Lock::Params::KEYSERVER_ID, server->keyserver_id()->str());`
`562`	`556`	`lock.setString(Lock::Params::TRANSACTION_ID, server->transaction_id()->str());`
`563`		`- } else {`
`564`		`- LOG_ERROR("Invalid file format");`
`565`	`557`	`}`
`566`	`558`	`return;`
`567`	`559`	`case Capsule::recipients_SymmetricKeyCapsule:`
`@@ -616,7 +608,7 @@ CDoc2Reader::Private::buildLock(Lock& lock, const cdoc20::header::RecipientRecor`
`616`	`608`	`}`
`617`	`609`	`return;`
`618`	`610`	`default:`
`619`		`- LOG_ERROR("Unsupported Key Details: skipping");`
	`611`	`+ LOG_ERROR("Unsupported capsule type");`
`620`	`612`	`}`
`621`	`613`	`}`
`622`	`614`