Unify subj↔sub

diff --git a/go/cm/cmd/enctool/prv-encrypted.t b/go/cm/cmd/enctool/prv-encrypted.t
index f7912e8acabca180d49befee2beb29a2185d0663f3f326f0371267bb9367c47e..1e83d9f10505a740e459fa5f950a949488a257e5ce31aca776060868fe77d75e 100755 (executable)
--- a/go/cm/cmd/enctool/prv-encrypted.t
+++ b/go/cm/cmd/enctool/prv-encrypted.t
@@ -5,7 +5,7 @@ test_description="Check passphrase-encrypted key decryption"
 
 TMPDIR=${TMPDIR:-/tmp}
 
-cmkeytool -algo sntrup4591761-x25519 -ku kem -subj A=KEY 5>$TMPDIR/enc.pub 9>$TMPDIR/enc.prv
+cmkeytool -algo sntrup4591761-x25519 -ku kem -sub A=KEY 5>$TMPDIR/enc.pub 9>$TMPDIR/enc.prv
 dd if=/dev/urandom of=$TMPDIR/enc.data bs=12K count=1 2>/dev/null
 export CMENCTOOL_PASSPHRASE=$(dd if=/dev/urandom bs=32 count=1 2>/dev/null | xxd -p)
 balloonparams="-balloon-s 123 -balloon-t 2"

diff --git a/go/cm/cmd/enctool/pub.t b/go/cm/cmd/enctool/pub.t
index 25560c2c0297429b6c8c644426990ed35dc9afc6bad6fcd541ba5e59972231dc..19908ee00a833c2947aa0a07a09dfea8f729559cf6bf22b379a9f8ccbccad5d7 100755 (executable)
--- a/go/cm/cmd/enctool/pub.t
+++ b/go/cm/cmd/enctool/pub.t
@@ -11,12 +11,12 @@ balloonparams="-balloon-s 123 -balloon-t 2"
 algo=mceliece6960119-x25519
 algo0=$algo
 test_expect_success "$algo: pub generation" "cmkeytool \
-    -algo $algo -ku kem -subj A=$algo \
+    -algo $algo -ku kem -sub A=$algo \
     5>$TMPDIR/enc.$algo.pub 9>$TMPDIR/enc.$algo.prv"
 algo=sntrup4591761-x25519
 algo1=$algo
 test_expect_success "$algo: pub generation" "cmkeytool \
-    -algo $algo -ku kem -subj A=$algo \
+    -algo $algo -ku kem -sub A=$algo \
     5>$TMPDIR/enc.$algo.pub 9>$TMPDIR/enc.$algo.prv"
 
 test_expect_success "encrypting" "

diff --git a/go/cm/cmd/keytool/certification.t b/go/cm/cmd/keytool/certification.t
index a97e8b3cb9fc8bddfac91dc289ad10bc9ecae956b8d1ff2fd609ae7a6a8eb149..e71bed137e684832302b271a2704d0539a4e1cb30f146bcce67d50b77ee3669e 100755 (executable)
--- a/go/cm/cmd/keytool/certification.t
+++ b/go/cm/cmd/keytool/certification.t
@@ -8,9 +8,9 @@ TMPDIR=${TMPDIR:-/tmp}
 echo "gost3410-512C gost3410-256A
 ed25519-blake2b ed25519-blake2b" | while read caAlgo eeAlgo ; do
 
-subj="-subj CN=CA -subj C=RU"
+sub="-sub CN=CA -sub C=RU"
 test_expect_success "$caAlgo: CA load generation" "cmkeytool \
-    -algo $caAlgo -ku sig $subj \
+    -algo $caAlgo -ku sig $sub \
     5>$TMPDIR/ca.$caAlgo.pub 9>$TMPDIR/ca.$caAlgo.prv"
 test_expect_success "$caAlgo: CA generation" "cmkeytool \
     4<$TMPDIR/ca.$caAlgo.pub \
@@ -27,9 +27,9 @@ mv $TMPDIR/ca.$caAlgo.pub.certified $TMPDIR/ca.$caAlgo.pub
 test_expect_success "$caAlgo: CA self-signature" "cmkeytool -verify \
     4<$TMPDIR/ca.$caAlgo.pub <$TMPDIR/ca.$caAlgo.pub"
 
-subj="-subj CN=SubCA -subj C=RU"
+sub="-sub CN=SubCA -sub C=RU"
 test_expect_success "$eeAlgo: SubCA load generation" "cmkeytool \
-    -algo $eeAlgo -ku sig $subj \
+    -algo $eeAlgo -ku sig $sub \
     5>$TMPDIR/subca.$eeAlgo.pub 9>$TMPDIR/subca.$eeAlgo.prv"
 test_expect_success "$eeAlgo: SubCA generation" "cmkeytool \
     4<$TMPDIR/ca.$caAlgo.pub \
@@ -40,9 +40,9 @@ mv $TMPDIR/subca.$eeAlgo.pub.certified $TMPDIR/subca.$eeAlgo.pub
 test_expect_success "$eeAlgo: SubCA signature" "cmkeytool -verify \
     4<$TMPDIR/ca.$caAlgo.pub <$TMPDIR/subca.$eeAlgo.pub"
 
-subj="-subj CN=EE -subj C=RU"
+sub="-sub CN=EE -sub C=RU"
 test_expect_success "$eeAlgo: EE load generation" "cmkeytool \
-    -algo $eeAlgo $subj \
+    -algo $eeAlgo $sub \
     5>$TMPDIR/ee.$eeAlgo.pub 9>$TMPDIR/ee.$eeAlgo.prv"
 test_expect_success "$eeAlgo: EE generation" "cmkeytool \
     4<$TMPDIR/subca.$eeAlgo.pub \

diff --git a/go/cm/cmd/keytool/kem-generation.t b/go/cm/cmd/keytool/kem-generation.t
index 61c7b3f011d082df634bfc628b799ee1cd47cadc4ae79eb7b9bf4d26bc1b0a84..8a27669729efcd5a082b2d356478a72fecb621e1454650ae4e48695c443cf3f3 100755 (executable)
--- a/go/cm/cmd/keytool/kem-generation.t
+++ b/go/cm/cmd/keytool/kem-generation.t
@@ -10,7 +10,7 @@ sntrup4591761-x25519" | while read algo ; do
 
 test_expect_success "$algo: generation" "cmkeytool \
     -algo $algo \
-    -ku kem -subj CN=DH 5>$TMPDIR/kem.$algo.pub 9>$TMPDIR/kem.$algo.prv"
+    -ku kem -sub CN=DH 5>$TMPDIR/kem.$algo.pub 9>$TMPDIR/kem.$algo.prv"
 
 done
 

diff --git a/go/cm/cmd/keytool/main.go b/go/cm/cmd/keytool/main.go
index 41a471a4f3e64580de9a1d6ef655450e675a8bf4418afe3ab60ae7ecbc24d900..d6a000f34ccf11f356bcd7303d4a70990fe87346957c1dbd36f40bb26c7b7633 100644 (file)
--- a/go/cm/cmd/keytool/main.go
+++ b/go/cm/cmd/keytool/main.go
@@ -58,7 +58,7 @@ func mustReadAll(r io.ReadCloser) []byte {
 func main() {
        flag.Usage = usage
        ku := make(map[string]*struct{})
-       subj := make(map[string]string)
+       sub := make(map[string]string)
        flag.Func(
                "ku",
                "Optional key usage, can be specified multiple times",
@@ -68,14 +68,14 @@ func main() {
                },
        )
        flag.Func(
-               "subj",
+               "sub",
                "Part of subject, key=value, can be specified multiple times",
                func(v string) error {
                        s := strings.SplitN(v, "=", 2)
                        if len(s) != 2 {
                                return errors.New("invalid key=value")
                        }
-                       subj[s[0]] = s[1]
+                       sub[s[0]] = s[1]
                        return nil
                },
        )
@@ -112,7 +112,7 @@ func main() {
        fdPrvW := os.NewFile(FdPrvW, "prv-out")
 
        var doCertify bool
-       if len(subj) == 0 && !*verify {
+       if len(sub) == 0 && !*verify {
                doCertify = true
        }
 
@@ -198,7 +198,7 @@ func main() {
                        }
                }
                {
-                       pubLoad = &sign.PubLoad{Subj: subj, Pub: []cm.AV{{A: *algo, V: pub}}}
+                       pubLoad = &sign.PubLoad{Sub: sub, Pub: []cm.AV{{A: *algo, V: pub}}}
                        var hasher hash.Hash
                        switch *algo {
                        case ed25519blake2b.Ed25519BLAKE2b, sntrup4591761x25519.SNTRUP4591761X25519:

diff --git a/go/cm/cmd/keytool/usage.go b/go/cm/cmd/keytool/usage.go
index d93be5a3b2ab2f5ab35706e8b4d58dfaac486cc96a3745b0876ff5a4e3679412..a9c854e4a354daccead47edfaa00626758bccb824f0b20ae717436ba38399296 100644 (file)
--- a/go/cm/cmd/keytool/usage.go
+++ b/go/cm/cmd/keytool/usage.go
@@ -24,7 +24,7 @@ import (
 func usage() {
        fmt.Fprintf(os.Stderr, `Usage:
   Generate public key load:
-    cmkeytool -subj K=V [-subj K=V ...] [-algo ALGO] [-ku KU ...] 5>PUB 9>PRV
+    cmkeytool -sub K=V [-sub K=V ...] [-algo ALGO] [-ku KU ...] 5>PUB 9>PRV
   Certify public key:
     cmkeytool [-lifetime DAYS] [-since DATE] 4<CA-PUB 8<CA-PRV <PUB
   Verify certification:

diff --git a/go/cm/cmd/sigtool/basic.t b/go/cm/cmd/sigtool/basic.t
index 232a54eee4d96a9d04c22f5f5bedd297299b3c5367023680cd680ca2eb5faec6..0cab904d610c32f4c37109cf42ef6f7c5354940d7c5e5353edeb580415cc6dbc 100755 (executable)
--- a/go/cm/cmd/sigtool/basic.t
+++ b/go/cm/cmd/sigtool/basic.t
@@ -9,10 +9,10 @@ echo "gost3410-512C
 gost3410-256A
 ed25519-blake2b" | while read keyalgo ; do
 
-subj="-subj what=ever"
+sub="-sub what=ever"
 typ="some-different-type"
 test_expect_success "$keyalgo: pub generation" "cmkeytool \
-    -algo $keyalgo -ku sig $subj \
+    -algo $keyalgo -ku sig $sub \
     5>$TMPDIR/sign.$keyalgo.pub 9>$TMPDIR/sign.$keyalgo.prv"
 dd if=/dev/urandom of=$TMPDIR/sign.$keyalgo.data bs=300K count=1 2>/dev/null
 encTo="-encrypted-to $(uuidgen)"

diff --git a/go/cm/sign/pub.go b/go/cm/sign/pub.go
index 221e5f628d9e11a8ee79a098f297de38202176be9bd0cd034f1cf33472844072..4c76131ab6451f9112b21933c33b453ea46302e72136680ff241c9c5bd1d4f34 100644 (file)
--- a/go/cm/sign/pub.go
+++ b/go/cm/sign/pub.go
@@ -45,7 +45,7 @@ var (
 // Public key load.
 type PubLoad struct {
        KU   *map[string]*struct{} `keks:"ku,omitempty"`
-       Subj map[string]string     `keks:"sub"`
+       Sub  map[string]string     `keks:"sub"`
        Crit *[]map[string]any     `keks:"crit,omitempty"`
        Pub  []cm.AV               `keks:"pub"`
        Id   uuid.UUID             `keks:"id"`
@@ -93,7 +93,7 @@ func (signed *Signed) PubParse() error {
                        }
                }
        }
-       if len(load.Subj) == 0 {
+       if len(load.Sub) == 0 {
                return errors.New("PubParse: empty sub")
        }
        if load.Crit != nil {