From 66fa13c0067ad3a095b6bd0ffb925e410c66ab98bc4b195f711e254788c4e188 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 20 Feb 2025 10:12:09 +0300 Subject: [PATCH] =?utf8?q?Unify=20subj=E2=86=94sub?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- go/cm/cmd/enctool/prv-encrypted.t | 2 +- go/cm/cmd/enctool/pub.t | 4 ++-- go/cm/cmd/keytool/certification.t | 12 ++++++------ go/cm/cmd/keytool/kem-generation.t | 2 +- go/cm/cmd/keytool/main.go | 10 +++++----- go/cm/cmd/keytool/usage.go | 2 +- go/cm/cmd/sigtool/basic.t | 4 ++-- go/cm/sign/pub.go | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/go/cm/cmd/enctool/prv-encrypted.t b/go/cm/cmd/enctool/prv-encrypted.t index f7912e8..1e83d9f 100755 --- 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 25560c2..19908ee 100755 --- 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 a97e8b3..e71bed1 100755 --- 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 61c7b3f..8a27669 100755 --- 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 41a471a..d6a000f 100644 --- 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 d93be5a..a9c854e 100644 --- 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$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 221e5f6..4c76131 100644 --- 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 { -- 2.48.1