diff --git a/cmd/micro_anon/.gitignore b/cmd/micro_anon/.gitignore index f264b6c2..6e09eab7 100644 --- a/cmd/micro_anon/.gitignore +++ b/cmd/micro_anon/.gitignore @@ -1,2 +1,3 @@ -priv.key -_keys/*.key +_init/priv.key +_init/pub.key +_keys/*.key diff --git a/cmd/micro_anon/Makefile b/cmd/micro_anon/Makefile new file mode 100644 index 00000000..f3bfad2e --- /dev/null +++ b/cmd/micro_anon/Makefile @@ -0,0 +1,12 @@ +NICKNAME=init_node +HOST=127.0.0.1 +PORT=8080 + +.PHONY: default build run clean +default: build run +build: + cd _init && go run ../keygen +run: + go run . $(NICKNAME) $(HOST):$(PORT) +clean: + rm _init/priv.key _init/pub.key diff --git a/cmd/micro_anon/_init/connects.txt b/cmd/micro_anon/_init/connects.txt index 765ec5c0..eab1148d 100644 --- a/cmd/micro_anon/_init/connects.txt +++ b/cmd/micro_anon/_init/connects.txt @@ -1,5 +1 @@ -http://localhost:7070 -http://localhost:8080 -http://localhost:9090 -http://localhost:2020 -http://localhost:3030 +connects \ No newline at end of file diff --git a/cmd/micro_anon/_init/pub.key b/cmd/micro_anon/_init/pub.key deleted file mode 100644 index 014d9621..00000000 --- a/cmd/micro_anon/_init/pub.key +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIICCgKCAgEAmdYxXBCSEg6gZSX0Jh4G0IbV72f5mZx4tCFEGYEtndko4pKM3l5s -Va/PuJAozG+pAfc4EJhZd5XzWFaHOnxY5EaujRqDjbfsvL85SVtiync6G9rnQi5v -UTmzVlPPsyUbSnAfLE+RTEPLpzPrsfgdfYTjQfzlwN43WNVaAsQ/5tfLTz4bjf7E -YpyabpB9AOOOh1gHN97ySe0VPTOv5RNJC10iZKzADlxL6Rf8TN36fWdHtyDMnLKE -kawojyDOMpvhYqK05lRHyyuh3QRQPbZxiQw0ZXPPkp43onGUuvEPWMO5TcGk2Mco -JACxtTGLE2JoaFwm1BtbkEiU1zQkvn7qeugHbapRI0NAwBfwfLBbiPo0NVK2VyuZ -Q125AEqP/JQ/yKEvKkQMpm19aG+BShKU/70ANanp0YuljjgXoVGP4tkgdIcdDpkV -6saq1dsQcsoViaZAQXWro3i70/NF/nO4Os8HQM2ICrADREjdq312dUxPWzfNOAcr -gjyBmuW72xte76RZkJkVrm+y8Hcb29CPzqFkJx6m8BV8mLOabld14uZvATKoPQo0 -ReTPbqpxN+t+xL9s8GFCi8gDKLAB7GERZDVtKMssYhOv06YJdgEt1QGQoX4p/iS8 -KTaNqjxlgpfSzdYXQIcL+AebOXu54By8TivY8XgGb3ObqdtreF5alZUCAwEAAQ== ------END PUBLIC KEY----- diff --git a/cmd/micro_anon/keygen/node.key b/cmd/micro_anon/keygen/node.key deleted file mode 100644 index 014d9621..00000000 --- a/cmd/micro_anon/keygen/node.key +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIICCgKCAgEAmdYxXBCSEg6gZSX0Jh4G0IbV72f5mZx4tCFEGYEtndko4pKM3l5s -Va/PuJAozG+pAfc4EJhZd5XzWFaHOnxY5EaujRqDjbfsvL85SVtiync6G9rnQi5v -UTmzVlPPsyUbSnAfLE+RTEPLpzPrsfgdfYTjQfzlwN43WNVaAsQ/5tfLTz4bjf7E -YpyabpB9AOOOh1gHN97ySe0VPTOv5RNJC10iZKzADlxL6Rf8TN36fWdHtyDMnLKE -kawojyDOMpvhYqK05lRHyyuh3QRQPbZxiQw0ZXPPkp43onGUuvEPWMO5TcGk2Mco -JACxtTGLE2JoaFwm1BtbkEiU1zQkvn7qeugHbapRI0NAwBfwfLBbiPo0NVK2VyuZ -Q125AEqP/JQ/yKEvKkQMpm19aG+BShKU/70ANanp0YuljjgXoVGP4tkgdIcdDpkV -6saq1dsQcsoViaZAQXWro3i70/NF/nO4Os8HQM2ICrADREjdq312dUxPWzfNOAcr -gjyBmuW72xte76RZkJkVrm+y8Hcb29CPzqFkJx6m8BV8mLOabld14uZvATKoPQo0 -ReTPbqpxN+t+xL9s8GFCi8gDKLAB7GERZDVtKMssYhOv06YJdgEt1QGQoX4p/iS8 -KTaNqjxlgpfSzdYXQIcL+AebOXu54By8TivY8XgGb3ObqdtreF5alZUCAwEAAQ== ------END PUBLIC KEY----- diff --git a/cmd/micro_anon/main.go b/cmd/micro_anon/main.go index 94f9dc94..c8550394 100644 --- a/cmd/micro_anon/main.go +++ b/cmd/micro_anon/main.go @@ -119,14 +119,20 @@ func runQueue() { } } +func getQueue() chan []byte { + if len(queue) == 0 { + return queueVoid + } + return queue +} + func runQueueVoid() { for { if len(queueVoid) == queueSize { time.Sleep(time.Second) continue } - msg := "" - encBytes, err := rsa.EncryptOAEP(sha256.New(), rand.Reader, &privKey.PublicKey, []byte(msg), nil) + encBytes, err := rsa.EncryptOAEP(sha256.New(), rand.Reader, &privKey.PublicKey, []byte(""), nil) if err != nil { panic(err) } @@ -134,13 +140,6 @@ func runQueueVoid() { } } -func getQueue() chan []byte { - if len(queue) == 0 { - return queueVoid - } - return queue -} - func getPubKey(filename string, pubKey *rsa.PublicKey) error { pubKeyBytes, err := os.ReadFile(keysDir + filename) if err != nil { @@ -148,7 +147,7 @@ func getPubKey(filename string, pubKey *rsa.PublicKey) error { } pubKeyBlock, _ := pem.Decode(pubKeyBytes) if pubKeyBlock == nil || pubKeyBlock.Type != "PUBLIC KEY" { - panic("pem block is invalid") + panic("public key: pem block is invalid") } pub, err := x509.ParsePKCS1PublicKey(pubKeyBlock.Bytes) if err != nil { @@ -173,7 +172,7 @@ func getPrivKey() *rsa.PrivateKey { } privateKeyBlock, _ := pem.Decode(privKeyBytes) if privateKeyBlock == nil || privateKeyBlock.Type != "PRIVATE KEY" { - panic("pem block is invalid") + panic("private key: pem block is invalid") } priv, err := x509.ParsePKCS1PrivateKey(privateKeyBlock.Bytes) if err != nil {