Remove excess "pki" prefix from the namespace

diff --git a/gyac/yacpki/algo.go b/gyac/pki/algo.go
similarity index 56%
rename from gyac/yacpki/algo.go
rename to gyac/pki/algo.go
index fcee50c7147579bd741ba77b3e497dfd5b437da8e52b66538bbd0bfb3bd22ce0..22d3b7656fcf61e7f57e485285b5bdf2d6351e07ece91e465f97b7b372a11ec1 100644 (file)
--- a/gyac/yacpki/algo.go
+++ b/gyac/pki/algo.go
@@ -1,8 +1,8 @@
-package yacpki
+package pki
 
 import (
-       "go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b"
-       "go.cypherpunks.su/yac/gyac/yacpki/gost"
+       "go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b"
+       "go.cypherpunks.su/yac/gyac/pki/gost"
 )
 
 const (

diff --git a/gyac/yacpki/av.go b/gyac/pki/av.go
similarity index 88%
rename from gyac/yacpki/av.go
rename to gyac/pki/av.go
index acfdc90d40e36249d42c4f0eabdd4811c8b0943140939baf0b390da6ba9c1374..4e601d8ff79a945a86f1ee65ddb5daa23326e2bde72a656c14fe9e1194f7553e 100644 (file)
--- a/gyac/yacpki/av.go
+++ b/gyac/pki/av.go
@@ -1,4 +1,4 @@
-package yacpki
+package pki
 
 import (
        "bytes"
@@ -7,8 +7,8 @@ import (
        "github.com/google/uuid"
 
        "go.cypherpunks.su/yac/gyac"
-       pkihash "go.cypherpunks.su/yac/gyac/yacpki/hash"
-       "go.cypherpunks.su/yac/gyac/yacpki/utils"
+       pkihash "go.cypherpunks.su/yac/gyac/pki/hash"
+       "go.cypherpunks.su/yac/gyac/pki/utils"
 )
 
 // Algorithm-value often used structure.

diff --git a/gyac/yacpki/cer.go b/gyac/pki/cer.go
similarity index 97%
rename from gyac/yacpki/cer.go
rename to gyac/pki/cer.go
index 62b7a3ae32e541db010982e14955908161e267c90495baa473021f59a12f6b7b..4235fc4339e1bd870d7263252381908acca90841485c7b1fc4c93ee7713802c8 100644 (file)
--- a/gyac/yacpki/cer.go
+++ b/gyac/pki/cer.go
@@ -1,4 +1,4 @@
-package yacpki
+package pki
 
 import (
        "crypto"
@@ -10,8 +10,8 @@ import (
 
        "go.cypherpunks.su/yac/gyac"
        "go.cypherpunks.su/yac/gyac/mapstruct"
-       ed25519blake2b "go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b"
-       "go.cypherpunks.su/yac/gyac/yacpki/gost"
+       ed25519blake2b "go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b"
+       "go.cypherpunks.su/yac/gyac/pki/gost"
 )
 
 const (

diff --git a/gyac/yacpki/cmd/yacertool/basic.t b/gyac/pki/cmd/yacertool/basic.t
similarity index 100%
rename from gyac/yacpki/cmd/yacertool/basic.t
rename to gyac/pki/cmd/yacertool/basic.t

diff --git a/gyac/yacpki/cmd/yacertool/main.go b/gyac/pki/cmd/yacertool/main.go
similarity index 75%
rename from gyac/yacpki/cmd/yacertool/main.go
rename to gyac/pki/cmd/yacertool/main.go
index 3742be66dfea7ba7f46aa58f89524c031ef852b56654a7a0bbbda86102c5e556..c71cd33067d77b7918876cbae9fd729c5fe183597f969fa3c6acb65db0cdceed 100644 (file)
--- a/gyac/yacpki/cmd/yacertool/main.go
+++ b/gyac/pki/cmd/yacertool/main.go
@@ -10,10 +10,10 @@ import (
        "time"
 
        "go.cypherpunks.su/yac/gyac"
-       "go.cypherpunks.su/yac/gyac/yacpki"
-       ed25519blake2b "go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b"
-       "go.cypherpunks.su/yac/gyac/yacpki/gost"
-       "go.cypherpunks.su/yac/gyac/yacpki/utils"
+       "go.cypherpunks.su/yac/gyac/pki"
+       ed25519blake2b "go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b"
+       "go.cypherpunks.su/yac/gyac/pki/gost"
+       "go.cypherpunks.su/yac/gyac/pki/utils"
 )
 
 func main() {
@@ -52,7 +52,7 @@ func main() {
                "Optional notBefore, \"2006-01-02 15:04:05\" format")
        lifetime := flag.Uint("lifetime", 365,
                "Lifetime of the certificate, days")
-       algo := flag.String("algo", yacpki.GOST3410256A, "Public key algorithm")
+       algo := flag.String("algo", pki.GOST3410256A, "Public key algorithm")
        issuingPrv := flag.String("ca-prv", "",
                "Path to private key file for issuing with")
        reuseKey := flag.Bool("reuse-key", false,
@@ -85,10 +85,10 @@ func main() {
        till := since.Add(time.Duration(*lifetime) * 24 * time.Hour)
 
        var caPrv crypto.Signer
-       var caCers []*yacpki.SignedData
+       var caCers []*pki.SignedData
        for _, issuingCer := range issuingCers {
-               var sd *yacpki.SignedData
-               sd, _, err = yacpki.CerParse(utils.MustReadFile(issuingCer))
+               var sd *pki.SignedData
+               sd, _, err = pki.CerParse(utils.MustReadFile(issuingCer))
                if err != nil {
                        log.Fatal(err)
                }
@@ -98,15 +98,15 @@ func main() {
                if *issuingPrv == "" {
                        log.Fatal("no -ca-key is set")
                }
-               caPrv, _, err = yacpki.PrvParse(utils.MustReadFile(*issuingPrv))
+               caPrv, _, err = pki.PrvParse(utils.MustReadFile(*issuingPrv))
                if err != nil {
                        log.Fatal(err)
                }
        }
 
        if *verify {
-               var sd *yacpki.SignedData
-               sd, _, err = yacpki.CerParse(utils.MustReadFile(*cerPath))
+               var sd *pki.SignedData
+               sd, _, err = pki.CerParse(utils.MustReadFile(*cerPath))
                if err != nil {
                        log.Fatal(err)
                }
@@ -125,15 +125,15 @@ func main() {
        var prvRaw []byte
        var pub []byte
        if *reuseKey {
-               prv, pub, err = yacpki.PrvParse(utils.MustReadFile(*prvPath))
+               prv, pub, err = pki.PrvParse(utils.MustReadFile(*prvPath))
                if err != nil {
                        log.Fatal(err)
                }
        } else {
                switch *algo {
-               case yacpki.Ed25519BLAKE2b:
+               case pki.Ed25519BLAKE2b:
                        prv, prvRaw, pub, err = ed25519blake2b.NewKeypair()
-               case yacpki.GOST3410256A, yacpki.GOST3410512C:
+               case pki.GOST3410256A, pki.GOST3410512C:
                        prv, prvRaw, pub, err = gost.NewKeypair(*algo)
                default:
                        err = errors.New("unknown -algo specified")
@@ -143,7 +143,7 @@ func main() {
                }
                err = os.WriteFile(
                        *prvPath,
-                       gyac.FromGo(yacpki.AV{A: *algo, V: prvRaw}).Encode(nil),
+                       gyac.FromGo(pki.AV{A: *algo, V: prvRaw}).Encode(nil),
                        0o600,
                )
                if err != nil {
@@ -151,23 +151,23 @@ func main() {
                }
        }
 
-       pubMap := yacpki.Pub{A: *algo, V: pub}
+       pubMap := pki.Pub{A: *algo, V: pub}
        {
-               av := yacpki.AV{A: *algo, V: pub}
+               av := pki.AV{A: *algo, V: pub}
                pubMap.Id = av.Id()
        }
-       cerLoad := yacpki.CerLoad{Subj: subj, Pub: []yacpki.Pub{pubMap}}
+       cerLoad := pki.CerLoad{Subj: subj, Pub: []pki.Pub{pubMap}}
        if len(ku) > 0 {
                cerLoad.KU = &ku
        }
-       var caCerLoad *yacpki.CerLoad
+       var caCerLoad *pki.CerLoad
        if caPrv == nil {
                caPrv = prv
                caCerLoad = &cerLoad
        } else {
                caCerLoad = caCers[0].CerLoad()
        }
-       sd := yacpki.SignedData{Load: yacpki.SignedDataLoad{T: "cer", V: cerLoad}}
+       sd := pki.SignedData{Load: pki.SignedDataLoad{T: "cer", V: cerLoad}}
        err = sd.CerIssueWith(caCerLoad, caPrv, since, till)
        if err != nil {
                log.Fatal(err)

diff --git a/gyac/yacpki/cmd/yacsdtool/main.go b/gyac/pki/cmd/yacsdtool/main.go
similarity index 80%
rename from gyac/yacpki/cmd/yacsdtool/main.go
rename to gyac/pki/cmd/yacsdtool/main.go
index 565fcedb3563130782ef7d9a0ebccd590dc10594ba75b44202b286a6ba1e65bc..7b170d9f1eade20cff7e4f8f09e7369155d507abec0f78fced57641d5ede6a45 100644 (file)
--- a/gyac/yacpki/cmd/yacsdtool/main.go
+++ b/gyac/pki/cmd/yacsdtool/main.go
@@ -11,9 +11,9 @@ import (
        "time"
 
        "go.cypherpunks.su/yac/gyac"
-       "go.cypherpunks.su/yac/gyac/yacpki"
-       pkihash "go.cypherpunks.su/yac/gyac/yacpki/hash"
-       "go.cypherpunks.su/yac/gyac/yacpki/utils"
+       "go.cypherpunks.su/yac/gyac/pki"
+       pkihash "go.cypherpunks.su/yac/gyac/pki/hash"
+       "go.cypherpunks.su/yac/gyac/pki/utils"
 )
 
 func main() {
@@ -30,7 +30,7 @@ func main() {
        if *cerPath == "" {
                log.Fatal("no -cer is set")
        }
-       cer, _, err := yacpki.CerParse(utils.MustReadFile(*cerPath))
+       cer, _, err := pki.CerParse(utils.MustReadFile(*cerPath))
        if err != nil {
                log.Fatal(err)
        }
@@ -40,7 +40,7 @@ func main() {
                if *prvPath == "" {
                        log.Fatal("no -prv is set")
                }
-               signer, _, err = yacpki.PrvParse(utils.MustReadFile(*prvPath))
+               signer, _, err = pki.PrvParse(utils.MustReadFile(*prvPath))
                if err != nil {
                        log.Fatal(err)
                }
@@ -55,8 +55,8 @@ func main() {
                log.Fatal(err)
        }
        if *verify {
-               var sd *yacpki.SignedData
-               sd, _, err = yacpki.SignedDataParse(utils.MustReadFile(*sdPath))
+               var sd *pki.SignedData
+               sd, _, err = pki.SignedDataParse(utils.MustReadFile(*sdPath))
                if err != nil {
                        log.Fatal(err)
                }
@@ -74,7 +74,7 @@ func main() {
                        log.Fatal("hash mismatch")
                }
                signer := cer.CerLoad()
-               if !signer.Can(yacpki.KUSig) || len(signer.Pub) != 1 {
+               if !signer.Can(pki.KUSig) || len(signer.Pub) != 1 {
                        log.Fatal("cer can not sign")
                }
                if sig.Sign.A != signer.Pub[0].A {
@@ -85,13 +85,13 @@ func main() {
                        log.Fatal(err)
                }
        } else {
-               var sd yacpki.SignedData
+               var sd pki.SignedData
                sd.Load.T = *typ
                sdHashes := map[string]*struct{}{*hashAlgo: nil}
                sd.Hashes = &sdHashes
                sigHashes := map[string][]byte{*hashAlgo: hasher.Sum(nil)}
                when := time.Now().UTC().Truncate(1000 * time.Microsecond)
-               err = sd.SignWith(cer.CerLoad(), signer, yacpki.SigTBS{
+               err = sd.SignWith(cer.CerLoad(), signer, pki.SigTBS{
                        Hashes: &sigHashes,
                        When:   &when,
                })

diff --git a/gyac/pki/doc.go b/gyac/pki/doc.go
new file mode 100644 (file)
index 0000000..42f80de
--- /dev/null
+++ b/gyac/pki/doc.go
@@ -0,0 +1,2 @@
+// gyac/pki provides PKI-related capabilities based on YAC encoded formats.
+package pki

diff --git a/gyac/yacpki/ed25519-blake2b/.gitignore b/gyac/pki/ed25519-blake2b/.gitignore
similarity index 100%
rename from gyac/yacpki/ed25519-blake2b/.gitignore
rename to gyac/pki/ed25519-blake2b/.gitignore

diff --git a/gyac/yacpki/ed25519-blake2b/algo.go b/gyac/pki/ed25519-blake2b/algo.go
similarity index 100%
rename from gyac/yacpki/ed25519-blake2b/algo.go
rename to gyac/pki/ed25519-blake2b/algo.go

diff --git a/gyac/yacpki/ed25519-blake2b/clean b/gyac/pki/ed25519-blake2b/clean
similarity index 100%
rename from gyac/yacpki/ed25519-blake2b/clean
rename to gyac/pki/ed25519-blake2b/clean

diff --git a/gyac/yacpki/ed25519-blake2b/ed25519-to-blake2b.patch b/gyac/pki/ed25519-blake2b/ed25519-to-blake2b.patch
similarity index 98%
rename from gyac/yacpki/ed25519-blake2b/ed25519-to-blake2b.patch
rename to gyac/pki/ed25519-blake2b/ed25519-to-blake2b.patch
index 859d32766edda2580c95cc874dd6744be9f3a68d26bc427d7ea5b408e2a8fd64..3bbb7764f0af85cc5aa68d0f403a087a3cfad52ea0eb3b0bbfa4d06a75f5fa26 100644 (file)
--- a/gyac/yacpki/ed25519-blake2b/ed25519-to-blake2b.patch
+++ b/gyac/pki/ed25519-blake2b/ed25519-to-blake2b.patch
@@ -2,7 +2,7 @@
 +++ ed25519/ed25519.go 2024-12-03 11:07:51.892841000 +0300
 @@ -20,11 +20,12 @@
        "crypto"
-       "go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b/edwards25519"
+       "go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b/edwards25519"
        cryptorand "crypto/rand"
 -      "crypto/sha512"
        "crypto/subtle"

diff --git a/gyac/yacpki/ed25519-blake2b/kp.go b/gyac/pki/ed25519-blake2b/kp.go
similarity index 84%
rename from gyac/yacpki/ed25519-blake2b/kp.go
rename to gyac/pki/ed25519-blake2b/kp.go
index e5975ff4dec77962997042b866e4acd97383e42bc18116fb1ab63a8d761e02bd..e366c33aa6d0b65223b77534883cc00a206ad834ba02480f008de65e07bb3919 100644 (file)
--- a/gyac/yacpki/ed25519-blake2b/kp.go
+++ b/gyac/pki/ed25519-blake2b/kp.go
@@ -4,7 +4,7 @@ import (
        "crypto"
        "crypto/rand"
 
-       "go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b/ed25519"
+       "go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b/ed25519"
 )
 
 func NewKeypair() (signer crypto.Signer, prv, pub []byte, err error) {

diff --git a/gyac/yacpki/ed25519-blake2b/mk-from-go b/gyac/pki/ed25519-blake2b/mk-from-go
similarity index 92%
rename from gyac/yacpki/ed25519-blake2b/mk-from-go
rename to gyac/pki/ed25519-blake2b/mk-from-go
index 1ab8ccec441ab43827bea8a4a69382f005a6889e6c93a21e8bfa4353338c7363..80c7493d9b6d16c9343e69b688ec61b33afd5802b47bd46093955d8bea09e149 100755 (executable)
--- a/gyac/yacpki/ed25519-blake2b/mk-from-go
+++ b/gyac/pki/ed25519-blake2b/mk-from-go
@@ -4,7 +4,7 @@
 # That script copies the library (tested on 1.23.3) and patches it to
 # use BLAKE2b hash.
 
-modname=go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b
+modname=go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b
 go mod init $modname
 dst=$PWD
 cd $(go env GOROOT)/src

diff --git a/gyac/yacpki/ed25519-blake2b/prv.go b/gyac/pki/ed25519-blake2b/prv.go
similarity index 83%
rename from gyac/yacpki/ed25519-blake2b/prv.go
rename to gyac/pki/ed25519-blake2b/prv.go
index 4764214a3c377978382cc3bcc27c2a1e94e95a6f5e97df7e5063aaff59ea668b..cf725c5923bdfd256ebe7a224201cc291cac4d9c66a68e445ee1bf3d36697313 100644 (file)
--- a/gyac/yacpki/ed25519-blake2b/prv.go
+++ b/gyac/pki/ed25519-blake2b/prv.go
@@ -4,7 +4,7 @@ import (
        "crypto"
        "errors"
 
-       "go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b/ed25519"
+       "go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b/ed25519"
 )
 
 func NewSigner(v []byte) (prv crypto.Signer, pub []byte, err error) {

diff --git a/gyac/yacpki/ed25519-blake2b/verify.go b/gyac/pki/ed25519-blake2b/verify.go
similarity index 83%
rename from gyac/yacpki/ed25519-blake2b/verify.go
rename to gyac/pki/ed25519-blake2b/verify.go
index c8f542199d36a1f6c1ac1a4e454df8d145b428c66210821e478101f2a8fe683f..9c92f0c7c5f2bb7c16d011ef6e535c98278a2b595a98565b5f1e4a56356203e9 100644 (file)
--- a/gyac/yacpki/ed25519-blake2b/verify.go
+++ b/gyac/pki/ed25519-blake2b/verify.go
@@ -3,7 +3,7 @@ package ed25519blake2b
 import (
        "errors"
 
-       "go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b/ed25519"
+       "go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b/ed25519"
 )
 
 func Verify(pub, signed, signature []byte) (valid bool, err error) {

diff --git a/gyac/yacpki/go.mod b/gyac/pki/go.mod
similarity index 77%
rename from gyac/yacpki/go.mod
rename to gyac/pki/go.mod
index 15b3a5fc6c9d349e0316880cf2a300e88c142f94f96c22f460f239751bc1af44..c73c6ac6877a067089f11d62d50daf749b800d6e16b8e3c95a5a3fddb6a02c1a 100644 (file)
--- a/gyac/yacpki/go.mod
+++ b/gyac/pki/go.mod
@@ -1,4 +1,4 @@
-module go.cypherpunks.su/yac/gyac/yacpki
+module go.cypherpunks.su/yac/gyac/pki
 
 go 1.22
 

diff --git a/gyac/yacpki/go.sum b/gyac/pki/go.sum
similarity index 100%
rename from gyac/yacpki/go.sum
rename to gyac/pki/go.sum

diff --git a/gyac/yacpki/gost/gost.go b/gyac/pki/gost/gost.go
similarity index 100%
rename from gyac/yacpki/gost/gost.go
rename to gyac/pki/gost/gost.go

diff --git a/gyac/yacpki/gost/kp.go b/gyac/pki/gost/kp.go
similarity index 100%
rename from gyac/yacpki/gost/kp.go
rename to gyac/pki/gost/kp.go

diff --git a/gyac/yacpki/gost/signer.go b/gyac/pki/gost/signer.go
similarity index 100%
rename from gyac/yacpki/gost/signer.go
rename to gyac/pki/gost/signer.go

diff --git a/gyac/yacpki/gost/verify.go b/gyac/pki/gost/verify.go
similarity index 94%
rename from gyac/yacpki/gost/verify.go
rename to gyac/pki/gost/verify.go
index 6412ed3d592bac8dcb84fca3ec98f1c8570cbe5d95bf066ce5fba1b7bee9b1a1..89bf1f4f4de3913ba29be4cf63346ab3244e976141ab5a4ff05facf4b0700e84 100644 (file)
--- a/gyac/yacpki/gost/verify.go
+++ b/gyac/pki/gost/verify.go
@@ -6,7 +6,7 @@ import (
        "go.cypherpunks.su/gogost/v6/gost3410"
        "go.cypherpunks.su/gogost/v6/gost34112012256"
        "go.cypherpunks.su/gogost/v6/gost34112012512"
-       "go.cypherpunks.su/yac/gyac/yacpki/utils"
+       "go.cypherpunks.su/yac/gyac/pki/utils"
 )
 
 func Verify(algo string, pub, signed, signature []byte) (valid bool, err error) {

diff --git a/gyac/yacpki/hash/algo.go b/gyac/pki/hash/algo.go
similarity index 100%
rename from gyac/yacpki/hash/algo.go
rename to gyac/pki/hash/algo.go

diff --git a/gyac/yacpki/prv.go b/gyac/pki/prv.go
similarity index 83%
rename from gyac/yacpki/prv.go
rename to gyac/pki/prv.go
index feb0a83cc4d2d1919b52a74470abe64ce021d5cf8fb7ffd42940c64a6a37d26b..e6faa42c20a0c0d09dd08011269c1a002225656492a17d13fa44a83d1c08710a 100644 (file)
--- a/gyac/yacpki/prv.go
+++ b/gyac/pki/prv.go
@@ -1,4 +1,4 @@
-package yacpki
+package pki
 
 import (
        "crypto"
@@ -6,8 +6,8 @@ import (
        "fmt"
 
        "go.cypherpunks.su/yac/gyac/mapstruct"
-       ed25519blake2b "go.cypherpunks.su/yac/gyac/yacpki/ed25519-blake2b"
-       "go.cypherpunks.su/yac/gyac/yacpki/gost"
+       ed25519blake2b "go.cypherpunks.su/yac/gyac/pki/ed25519-blake2b"
+       "go.cypherpunks.su/yac/gyac/pki/gost"
 )
 
 // Parse private key contained in AV YAC-encoded structure.

diff --git a/gyac/yacpki/signed-data.go b/gyac/pki/signed-data.go
similarity index 99%
rename from gyac/yacpki/signed-data.go
rename to gyac/pki/signed-data.go
index 86f35b0636bd1f8025dd69c4e76a78083ae595e967d81f3cc9b55c57423cc7dd..30505e5a0aebdc22f9620672d7355f323f79ea99cb297d47620e5663c04ca603 100644 (file)
--- a/gyac/yacpki/signed-data.go
+++ b/gyac/pki/signed-data.go
@@ -1,4 +1,4 @@
-package yacpki
+package pki
 
 import (
        "crypto"

diff --git a/gyac/yacpki/utils/utils.go b/gyac/pki/utils/utils.go
similarity index 100%
rename from gyac/yacpki/utils/utils.go
rename to gyac/pki/utils/utils.go

diff --git a/gyac/yacpki/doc.go b/gyac/yacpki/doc.go
deleted file mode 100644 (file)
index 64fda62..0000000
--- a/gyac/yacpki/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// yacpki provides PKI-related capabilities based on YAC encoded formats.
-package yacpki