bootstrap.image.upload: generate sha256 checksums as well for checksums.txt

diff --git a/basis/bootstrap/image/download/download.factor b/basis/bootstrap/image/download/download.factor
index 0c04725e50c6e05cbcb0996386b0b2c87fd6f2ef..739b968f356fe240fe3ff9b825bec498cc368e7d 100644 (file)
--- a/basis/bootstrap/image/download/download.factor
+++ b/basis/bootstrap/image/download/download.factor
@@ -14,7 +14,7 @@ CONSTANT: download-url URL" https://downloads.factorcode.org/images/master/"
     md5 checksum-file bytes>hex-string ;
 
 : download-checksum ( image -- checksum )
-    download-checksums at ;
+    download-checksums at " " split1 drop ;
 
 : need-new-image? ( image -- ? )
     dup file-exists?

diff --git a/basis/bootstrap/image/upload/upload.factor b/basis/bootstrap/image/upload/upload.factor
index 6d26565210afdd7f6bcc0e40a4ecc8cb6f07602b..4061ffc098595563acb7af2ff4b79a30e8d9e2fd 100644 (file)
--- a/basis/bootstrap/image/upload/upload.factor
+++ b/basis/bootstrap/image/upload/upload.factor
@@ -42,8 +42,9 @@ SYMBOL: build-images-destination
     checksums-path ascii [
         boot-image-names [
             [ write bl ]
-            [ openssl-md5 checksum-file bytes>hex-string print ]
-            bi
+            [ openssl-md5 checksum-file bytes>hex-string write bl ]
+            [ openssl-sha256 checksum-file bytes>hex-string print ]
+            tri
         ] each
     ] with-file-writer ;
 

diff --git a/basis/checksums/openssl/openssl.factor b/basis/checksums/openssl/openssl.factor
index 421d9fc4a1a8f22a4795dc8f310ab294e151a016..b18c3dfaaa937447c2beca78b7fd59f820f81951 100644 (file)
--- a/basis/checksums/openssl/openssl.factor
+++ b/basis/checksums/openssl/openssl.factor
@@ -14,6 +14,8 @@ CONSTANT: openssl-md5 T{ openssl-checksum f "md5" }
 
 CONSTANT: openssl-sha1 T{ openssl-checksum f "sha1" }
 
+CONSTANT: openssl-sha256 T{ openssl-checksum f "sha256" }
+
 C: <openssl-checksum> openssl-checksum
 
 <PRIVATE