Fix Arch Linux crash on app selection

Dadoum · Oct 20, 2023 · 2437b59 · 2437b59
1 parent 98cadf5
commit 2437b59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/source/cms/cms_dec.d b/source/cms/cms_dec.d
@@ -6,11 +6,8 @@ import botan.asn1.ber_dec;
 import botan.asn1.oids;
 import botan.codec.pem;
 
-static this() {
-    OIDS.setDefaults();
-}
-
 ubyte[] dataFromCMS(DataSource source) {
+    OIDS.setDefaults();
     if (!maybeBER(source) || PEM.matches(source)) {
         source = cast(DataSource) DataSourceMemory(PEM.decodeCheckLabel(source, "PKCS7"));
     }

diff --git a/source/sideload/macho.d b/source/sideload/macho.d
@@ -42,10 +42,6 @@ version (BigEndian) {
     static assert(false, "Big endian systems are not supported");
 }
 
-static this() {
-    OIDS.setDefaults();
-}
-
 /// Will only parse little-endian on little-endian
 /// I have code which is more versatile, but since it's useless (almost everything is little-endian now),
 /// and is way more complex I won't put it here for now.
@@ -770,7 +766,10 @@ class SignatureBlob: Blob {
         this.hashers = hashers;
     }
 
-    ref DEREncoder encodeBlob(return ref DEREncoder der, ubyte[][] codeDirectories) { // made to match as closely as possible zsign
+    ref DEREncoder encodeBlob(return ref DEREncoder der, ubyte[][] codeDirectories) {
+        // made to match as closely as possible zsign
+        OIDS.setDefaults();
+
         auto rng = identity.rng;
         PKSigner signer = PKSigner(identity.privateKey, "EMSA3(SHA-256)");