build-103-patch (#15)

Author: adamyg

sign/signmanifest.cpp

@@ -1,4 +1,4 @@
-// $Id: signmanifest.cpp,v 1.4 2025/04/22 17:55:08 cvsuser Exp $
+// $Id: signmanifest.cpp,v 1.5 2025/04/23 11:17:53 cvsuser Exp $
 //
 //  AutoUpdater: Manifest generation tool.
 //
@@ -238,8 +238,8 @@ SignManifestEd(const char *filename, const char *version, const char *url,
 #endif
         strftime(pubDate, sizeof(pubDate), "%a, %d %b %Y %H:%M:%S +0000", &pubtime);
 
-        char url[1024] = {0};
-        ReplaceString(url, "%%", basename, url, sizeof(url));
+        char t_url[1024] = {0};
+        ReplaceString(url, "%%", basename, t_url, sizeof(t_url));
 
         std::cout
             << "\n"
@@ -248,7 +248,7 @@ SignManifestEd(const char *filename, const char *version, const char *url,
             << "\t<description></description>\n"
             << "\t<published>" << now << "</published>\n"
             << "\t<pubDate>" << pubDate << "</pubDate>\n"
-            << "\t<enclosure url=\"" << url << "\"\n"
+            << "\t<enclosure url=\"" << t_url << "\"\n"
                 << "\t\tos=\"windows\"\n"
                 << "\t\tname=\"" << basename << "\"\n"
                 << "\t\tversion=\"" << version << "\"\n"
@@ -353,9 +353,9 @@ Sign(const File& file, const struct SignKeyPair *key)
 
     // failure
     {
-        uint8_t t_signature[sizeof(signature)] = { 0 };
+        uint8_t t_signature[sizeof(signature)] = {0};
         memcpy(t_signature, signature, sizeof(signature));
-        t_signature[1] |= 1;
+        t_signature[1] ^= 1;
         assert(1 != ed25519_verify(t_signature, file.fileBuffer, file.fileSize, key->public_key));
     }
     assert(1 != ed25519_verify(signature, file.fileBuffer, file.fileSize - 1, key->public_key));

src/AutoConfig.h

@@ -1,6 +1,6 @@
 #ifndef AUTOCONFIG_H_INCLUDED
 #define AUTOCONFIG_H_INCLUDED
-//  $Id: AutoConfig.h,v 1.20 2025/04/22 17:25:25 cvsuser Exp $
+//  $Id: AutoConfig.h,v 1.21 2025/04/23 11:16:40 cvsuser Exp $
 //
 //  AutoUpdater: configuration management.
 //

util/Base64.h

@@ -1,6 +1,6 @@
 #ifndef BASE64_H_INCLUDED
 #define BASE64_H_INCLUDED
-//  $Id: Base64.h,v 1.1 2025/04/21 13:58:28 cvsuser Exp $
+//  $Id: Base64.h,v 1.2 2025/04/23 11:17:25 cvsuser Exp $
 //
 //  AutoUpdater: base64 utils
 //
@@ -40,7 +40,7 @@ class Base64 {
     static size_t
     encode_dstlength(size_t length)
     {
-        return (length * 4 / 3 + 4) + 1; /* 3-byte blocks to 4-byte */
+        return (length * 4 / 3 + 4) + 1; /* 3-byte blocks to 4-byte, plus nul */
     }
 
     static int
@@ -91,7 +91,8 @@ class Base64 {
     {
         std::string result;
         result.resize(encode_dstlength(length));
-        encode(src, length, const_cast<char *>(result.data()), result.size());
+        int ret = encode(src, length, const_cast<char *>(result.data()), result.size());
+        result.resize(ret <= 0 ? 0 : (size_t)(ret - /*nul*/1));
         return result;
     }
 
@@ -182,4 +183,4 @@ class Base64 {
 
 #endif //BASE64_H_INCLUDED
 
-//end
+//end