From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Tue, 6 Aug 2019 22:44:33 +0000 (-0700)
Subject: blowfish: downcase symbols, most names; fix copyright notices
X-Git-Tag: mit-scheme-pucked-10.1.20~12^2~7
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=ac6b5626d3d4de23c8f7d30384ead1b7ce11ad2f;p=mit-scheme.git

blowfish: downcase symbols, most names; fix copyright notices
---

diff --git a/src/blowfish/blowfish-check.scm b/src/blowfish/blowfish-check.scm
index 0128b445f..5c2f301a4 100644
--- a/src/blowfish/blowfish-check.scm
+++ b/src/blowfish/blowfish-check.scm
@@ -24,7 +24,7 @@ USA.
 
 |#
 
-;;;; Test the BLOWFISH option.
+;;;; Test the Blowfish option.
 
 (let ((sample (string->utf8 "Some text to encrypt and decrypt.")))
   (call-with-binary-output-file "test"
diff --git a/src/blowfish/blowfish-check.sh b/src/blowfish/blowfish-check.sh
index edf275a27..df0ee387f 100755
--- a/src/blowfish/blowfish-check.sh
+++ b/src/blowfish/blowfish-check.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Test the BLOWFISH option.
+# Test the Blowfish option.
 
 set -e
 ${MIT_SCHEME_EXE} --prepend-library . <<\EOF
-(load-option 'BLOWFISH)
+(load-option 'blowfish)
 (load "blowfish-check" (->environment '(blowfish)))
 EOF
diff --git a/src/blowfish/blowfish-test.scm b/src/blowfish/blowfish-test.scm
index 503a8e38c..bacd3e9e7 100644
--- a/src/blowfish/blowfish-test.scm
+++ b/src/blowfish/blowfish-test.scm
@@ -38,13 +38,13 @@ USA.
   (define p24 #u8(#xFE #xDC #xBA #x98 #x76 #x54 #x32 #x10))
   (let ((k (bytevector-copy k24 0 i))
         (p p24))
-    (define-bf-test (symbol 'VARIABLE-KEY ': i ': 'ENCRYPT)
+    (define-bf-test (symbol 'variable-key ': i ': 'encrypt)
       (lambda ()
         (let ((bf (blowfish-set-key k))
               (buf (make-bytevector 8)))
           (blowfish-ecb p buf bf #t)
           (assert-equal buf c))))
-    (define-bf-test (symbol 'VARIABLE-KEY ': i ': 'DECRYPT)
+    (define-bf-test (symbol 'variable-key ': i ': 'decrypt)
       (lambda ()
         (let ((bf (blowfish-set-key k))
               (buf (make-bytevector 8)))
@@ -79,13 +79,13 @@ USA.
 ((lambda (ks ps cs)
    ((lambda (doit) (for-each doit (iota (length ks)) ks ps cs))
     (lambda (i k p c)
-      (define-bf-test (symbol 'ENCRYPT ': i)
+      (define-bf-test (symbol 'encrypt ': i)
         (lambda ()
           (let ((bf (blowfish-set-key k))
                 (buf (make-bytevector 8)))
             (blowfish-ecb p buf bf #t)
             (assert-equal buf c))))
-      (define-bf-test (symbol 'DECRYPT ': i)
+      (define-bf-test (symbol 'decrypt ': i)
         (lambda ()
           (let ((bf (blowfish-set-key k))
                 (buf (make-bytevector 8)))
@@ -199,7 +199,7 @@ USA.
   (define iv #u8(7 6 5 4 3 2 1 0))
   (define p #u8(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23))
   (let ((p (bytevector-copy p 0 i)))
-    (define-bf-test (symbol 'CBC:ENCRYPT ': i)
+    (define-bf-test (symbol 'cbc:encrypt ': i)
       (lambda ()
         (let ((bf (blowfish-set-key k))
               (iv (bytevector-copy iv))
@@ -207,7 +207,7 @@ USA.
           (blowfish-cbc p buf bf iv #t)
           (assert-equal buf c)
           (assert-equal iv (bytevector-copy buf (- i 8) i)))))
-    (define-bf-test (symbol 'CBC:DECRYPT ': i)
+    (define-bf-test (symbol 'cbc:decrypt ': i)
       (lambda ()
         (let ((bf (blowfish-set-key k))
               (iv (bytevector-copy iv))
diff --git a/src/blowfish/blowfish.scm b/src/blowfish/blowfish.scm
index bb47b2c92..82f6e3d61 100644
--- a/src/blowfish/blowfish.scm
+++ b/src/blowfish/blowfish.scm
@@ -160,7 +160,7 @@ USA.
       (error:bad-range-argument end operator)))
 
 (define (blowfish-encrypt-port input output key init-vector encrypt?)
-  ;; Assumes that INPUT is in blocking mode.
+  ;; Assumes that input is in blocking mode.
   (let ((key (blowfish-set-key key))
 	(input-buffer (make-bytevector 4096))
 	(output-buffer (make-bytevector 4096)))
diff --git a/src/blowfish/compile.scm b/src/blowfish/compile.scm
index fc0c28cc1..cd4c5fb54 100644
--- a/src/blowfish/compile.scm
+++ b/src/blowfish/compile.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*- |#
 
-;;;; Compile the BLOWFISH option.
+;;;; Compile the Blowfish option.
 
 (load-option 'cref)
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
diff --git a/src/blowfish/compile.sh b/src/blowfish/compile.sh
index a64407e4d..cd44a886e 100755
--- a/src/blowfish/compile.sh
+++ b/src/blowfish/compile.sh
@@ -7,20 +7,20 @@
 #     2015, 2016, 2017, 2018, 2019 Massachusetts Institute of
 #     Technology
 #
-# This file is part of a Blowfish plugin for MIT/GNU Scheme.
+# This file is part of MIT/GNU Scheme.
 #
-# This plugin is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# MIT/GNU Scheme is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
 #
-# This plugin is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MIT/GNU Scheme is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this plugin; if not, write to the Free Software
+# along with MIT/GNU Scheme; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index 8e76f621c..9ad8f1ab7 100644
--- a/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([MIT/GNU Scheme blowfish plugin],
+AC_INIT([MIT/GNU Scheme Blowfish plugin],
         [1.1],
         [bug-mit-scheme@gnu.org],
         [mit-scheme-blowfish])
diff --git a/src/blowfish/make.scm b/src/blowfish/make.scm
index f10c19bbe..073b1d899 100644
--- a/src/blowfish/make.scm
+++ b/src/blowfish/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*- |#
 
-;;;; Load the BLOWFISH option.
+;;;; Load the Blowfish option.
 
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
diff --git a/src/blowfish/optiondb.scm b/src/blowfish/optiondb.scm
index 25c83119f..464571513 100644
--- a/src/blowfish/optiondb.scm
+++ b/src/blowfish/optiondb.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*- |#
 
-(define-load-option 'BLOWFISH
+(define-load-option 'blowfish
   (standard-system-loader "."))
 
 (further-load-options #t)
\ No newline at end of file