Merge pull request #8638 from mlschroe/appx

[backend] Fix appx signing with special certificate
openSUSE · Oct 30, 2019 · 3aae1fe · 3aae1fe
2 parents 8703a56 + a45b48b
commit 3aae1fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/backend/bs_signer b/src/backend/bs_signer
@@ -340,7 +340,7 @@ sub rsasign {
 sub signappx {
   my ($signfile, $jobdir, $projid, $signkey, $cert, @signargs) = @_;
 
-  if ((!$signkey || length($signkey) < 2) && $BSConfig::sign_type) {
+  if ((!$signkey || length($signkey) <= 2) && $BSConfig::sign_type) {
     # special signkey, ask for cert again with signtype appx
     my $param = {
       'uri' => "$BSConfig::srcserver/getsslcert",

diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -1101,7 +1101,7 @@ sub getsslcert {
     $cert = BSRPC::rpc({
       'uri' => "$server/getsslcert",
       'timeout' => $gettimeout,
-    }, undef, "project=$buildinfo->{'project'}", "autoextend=1");
+    }, undef, @args);
   };
   die("could not retrieve ssl certificate: $@\n") if $@;
   writestr("$dir/_projectcert.crt", undef, $cert) if $cert;