Unify cm.* usage

diff --git a/go/cm/cmd/cmenctool/main.go b/go/cm/cmd/cmenctool/main.go
index 15d959dc6ae6b9e74f1bf77e700d26ccce6cf119f3c4c8a803a25b43e2d3d4ad..3b6efdef8653c051c3e5a33ce7d91ab6338cd56482550fd184729e3add044a2b 100644 (file)
--- a/go/cm/cmd/cmenctool/main.go
+++ b/go/cm/cmd/cmenctool/main.go
@@ -1,4 +1,4 @@
-// cmenctool -- dealing with KEKS-encoded cm-encrypted utility
+// cmenctool -- dealing with KEKS-encoded cm/encrypted utility
 // Copyright (C) 2024-2025 Sergey Matveev <stargrave@stargrave.org>
 //
 // This program is free software: you can redistribute it and/or modify

diff --git a/go/cm/cmd/cmenctool/usage.go b/go/cm/cmd/cmenctool/usage.go
index 2167448a4bb7f85af209808f511b899d5c73d47772fa871ba022ab0bbcae6393..937e5d5c9f4b6ee17d39b696cb1b9be1fee3c0a79ca15385f0ac0093c5f2e006 100644 (file)
--- a/go/cm/cmd/cmenctool/usage.go
+++ b/go/cm/cmd/cmenctool/usage.go
@@ -1,4 +1,4 @@
-// cmenctool -- dealing with KEKS-encoded cm-encrypted utility
+// cmenctool -- dealing with KEKS-encoded cm/encrypted utility
 // Copyright (C) 2024-2025 Sergey Matveev <stargrave@stargrave.org>
 //
 // This program is free software: you can redistribute it and/or modify

diff --git a/go/cm/cmd/cmhshtool/main.go b/go/cm/cmd/cmhshtool/main.go
index 328ad5a318a16059d6be30806c018196e05d7fa8e9a95513f1aab7add9565f0a..e4ddc5bc767947923c62a76191fe0b91e9811048e601a3474c76c5d0ea240f68 100644 (file)
--- a/go/cm/cmd/cmhshtool/main.go
+++ b/go/cm/cmd/cmhshtool/main.go
@@ -1,4 +1,4 @@
-// cmhshtool -- dealing with KEKS-encoded cm-hashed utility
+// cmhshtool -- dealing with KEKS-encoded cm/hashed utility
 // Copyright (C) 2024-2025 Sergey Matveev <stargrave@stargrave.org>
 //
 // This program is free software: you can redistribute it and/or modify

diff --git a/go/cm/cmd/cmsigtool/main.go b/go/cm/cmd/cmsigtool/main.go
index 412c7d9036043b4bb5f8f567185c085a108acdcaf6133eaacf0e53b76fc6e514..e57c650b400467027d2b0b7ff74a399def7116e24f5b2f33484c87a3a0fe335e 100644 (file)
--- a/go/cm/cmd/cmsigtool/main.go
+++ b/go/cm/cmd/cmsigtool/main.go
@@ -1,4 +1,4 @@
-// cmsigtool -- dealing with KEKS-encoded cm-signed utility
+// cmsigtool -- dealing with KEKS-encoded cm/signed utility
 // Copyright (C) 2024-2025 Sergey Matveev <stargrave@stargrave.org>
 //
 // This program is free software: you can redistribute it and/or modify

diff --git a/go/cm/cmd/cmsigtool/usage.go b/go/cm/cmd/cmsigtool/usage.go
index 6f50677544eaa96344cc12ea474b652955d8b2b7bb1dcb0908500acae0c8b198..6eb4d64c3d52cdaff09d4e767d96b19dc81d0f010e5812bcbf40f093be412439 100644 (file)
--- a/go/cm/cmd/cmsigtool/usage.go
+++ b/go/cm/cmd/cmsigtool/usage.go
@@ -1,4 +1,4 @@
-// cmsigtool -- dealing with KEKS-encoded cm-signed utility
+// cmsigtool -- dealing with KEKS-encoded cm/signed utility
 // Copyright (C) 2024-2025 Sergey Matveev <stargrave@stargrave.org>
 //
 // This program is free software: you can redistribute it and/or modify

diff --git a/go/cm/sign/signed.go b/go/cm/sign/signed.go
index f24ced7d2cc77e91090f02158331bd8d9b0cfb200ed06d1805321bad66737091..d5c03fbb6399bab1768fdd5bd6d28ae684b071384135af6ca7c6d75aa994dc8a 100644 (file)
--- a/go/cm/sign/signed.go
+++ b/go/cm/sign/signed.go
@@ -65,7 +65,7 @@ type Signed struct {
        Sigs []*Sig     `keks:"sigs,omitempty"`
 }
 
-// Parse and validate cm-signed from KEKS-encoded data.
+// Parse and validate cm/signed from KEKS-encoded data.
 func Parse(data []byte) (signed *Signed, tail []byte, err error) {
        {
                var magic keks.Magic

diff --git a/spec/cm/encrypted.texi b/spec/cm/encrypted.texi
index 42a06825432a89ac2eec7457a407bbe4ec12c25708e946ed59ec6ec27f715004..31acc3fedd067b985e213bb0df96d743434bdd149c941c9164953b0c1ed0b9a2 100644 (file)
--- a/spec/cm/encrypted.texi
+++ b/spec/cm/encrypted.texi
@@ -34,7 +34,7 @@ additional fields supplementing the decryption process, like
 initialisation vector.
 
 If @code{/payload} is absent, then ciphertext is provided by other
-means, for example just by following the @code{cm-encrypted} structure.
+means, for example just by following the @code{cm/encrypted} structure.
 It is recommended to encode it as a BLOB, which chunk's length depends
 on DEM algorithm.
 

diff --git a/spec/cm/pub.texi b/spec/cm/pub.texi
index deefcad76550cb1b7ebdf02ac61612696d9e28bc9386f19ba303d3dce780c78a..7d5296f574931fd2fabd27470942b5652ec74a98c4c28d99cc527b78d776dcae 100644 (file)
--- a/spec/cm/pub.texi
+++ b/spec/cm/pub.texi
@@ -3,7 +3,7 @@
 @cindex cm/pub
 @section cm/pub format
 
-Public key is the @code{@ref{cm-signed}} structure.
+Public key is the @code{@ref{cm-signed, cm/signed}} structure.
 
 Stored in a file, it should begin with "cm/pub" @ref{MAGIC, magic}.
 
@@ -52,7 +52,7 @@ It @strong{must} be absent if empty. Values are extension specific.
 
 @end table
 
-@code{cm-signed}'s @code{sig-tbs} @strong{must} contain additional fields:
+@code{cm/signed}'s @code{sig-tbs} @strong{must} contain additional fields:
 
 @verbatiminclude ../tcl/schemas/pub-sig-tbs.tcl
 

diff --git a/spec/cm/signed.texi b/spec/cm/signed.texi
index 315467e5cc12e3b103814de72824e62a3eab35c6f76b608e558208fd6e1d2b08..da70afd1d7ab43ea41b0bca38085588055340943e1f6fb3e05bcf6910f89c31a 100644 (file)
--- a/spec/cm/signed.texi
+++ b/spec/cm/signed.texi
@@ -31,9 +31,9 @@ Signature is created by signing the:
 @end verbatim
 
 If no @code{/load/v} is provided, then the data is detached from the
-@code{cm-signed} structure itself and it is fed into hasher before that
+@code{cm/signed} structure itself and it is fed into hasher before that
 structure. You can provide it any way you wish, but for keeping that
-detached data closely to the @code{cm-signed}, you should use the
+detached data closely to the @code{cm/signed}, you should use the
 following approach:
 
 @verbatim