archive/nntpchan
Archived
1
0
Fork 0
Code

tabify

Browse Source
This commit is contained in:
Jeff Becker 2017-08-25 10:43:29 -04:00
parent cc5d94ee5f
commit d61228215e
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
8 changed files with 528 additions and 538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/backends/srndv2/src/srnd/vendor/github.com/majestrate/nacl/box.go generated vendored
View File

@ -26,7 +26,7 @@ func CryptoBox(msg, nounce, pk, sk []byte) ([]byte, error) {
return nil, err return nil, err
} }
if len(nounce) != int(C.crypto_box_macbytes()) { if len(nounce) != int(C.crypto_box_macbytes()) {
err := errors.New ("len(nounce) != crypto_box_macbytes()") err := errors.New("len(nounce) != crypto_box_macbytes()")
return nil, err return nil, err
} }

9
contrib/backends/srndv2/src/srnd/vendor/github.com/majestrate/nacl/buffer.go generated vendored
View File

@ -17,10 +17,9 @@ import (
// wrapper arround malloc/free // wrapper arround malloc/free
type Buffer struct { type Buffer struct {
ptr unsafe.Pointer; ptr unsafe.Pointer
length C.int; length C.int
size C.size_t; size C.size_t
} }
// wrapper arround nacl.malloc // wrapper arround nacl.malloc
@ -35,7 +34,7 @@ func Malloc(size int) *Buffer {
func malloc(size C.size_t) *Buffer { func malloc(size C.size_t) *Buffer {
ptr := C.malloc(size) ptr := C.malloc(size)
C.sodium_memzero(ptr, size) C.sodium_memzero(ptr, size)
buffer := &Buffer{ptr: ptr, size: size , length: C.int(size)} buffer := &Buffer{ptr: ptr, size: size, length: C.int(size)}
return buffer return buffer
} }

8
contrib/backends/srndv2/src/srnd/vendor/github.com/majestrate/nacl/key.go generated vendored
View File

@ -44,7 +44,7 @@ func GenSignKeypair() *KeyPair {
pk := malloc(pk_len) pk := malloc(pk_len)
res := C.crypto_sign_keypair(pk.uchar(), sk.uchar()) res := C.crypto_sign_keypair(pk.uchar(), sk.uchar())
if res == 0 { if res == 0 {
return &KeyPair{pk,sk} return &KeyPair{pk, sk}
} }
pk.Free() pk.Free()
sk.Free() sk.Free()
@ -78,7 +78,7 @@ func GetSignPubkey(sk []byte) ([]byte, error) {
func LoadSignKey(seed []byte) *KeyPair { func LoadSignKey(seed []byte) *KeyPair {
seed_len := C.crypto_sign_seedbytes() seed_len := C.crypto_sign_seedbytes()
if C.size_t(len(seed)) != seed_len { if C.size_t(len(seed)) != seed_len {
return nil panic(fmt.Sprintf("Bad seed length %d bytes", len(seed)))
} }
seedbuff := NewBuffer(seed) seedbuff := NewBuffer(seed)
defer seedbuff.Free() defer seedbuff.Free()
@ -102,14 +102,13 @@ func GenBoxKeypair() *KeyPair {
pk := malloc(pk_len) pk := malloc(pk_len)
res := C.crypto_box_keypair(pk.uchar(), sk.uchar()) res := C.crypto_box_keypair(pk.uchar(), sk.uchar())
if res == 0 { if res == 0 {
return &KeyPair{pk,sk} return &KeyPair{pk, sk}
} }
pk.Free() pk.Free()
sk.Free() sk.Free()
return nil return nil
} }
// get public key from secret key // get public key from secret key
func GetBoxPubkey(sk []byte) []byte { func GetBoxPubkey(sk []byte) []byte {
sk_len := C.crypto_box_seedbytes() sk_len := C.crypto_box_seedbytes()
@ -170,7 +169,6 @@ func CryptoSignPublicLen() int {
return int(C.crypto_sign_publickeybytes()) return int(C.crypto_sign_publickeybytes())
} }
func CryptoSignSecretLen() int { func CryptoSignSecretLen() int {
return int(C.crypto_sign_secretkeybytes()) return int(C.crypto_sign_secretkeybytes())
} }

1
contrib/backends/srndv2/src/srnd/vendor/github.com/majestrate/nacl/nacl.go generated vendored
View File

@ -35,7 +35,6 @@ func CryptoSignPrivKeySize() int {
return int(C.crypto_sign_secretkeybytes()) return int(C.crypto_sign_secretkeybytes())
} }
// initialize sodium // initialize sodium
func init() { func init() {
status := C.sodium_init() status := C.sodium_init()

4
contrib/backends/srndv2/src/srnd/vendor/github.com/majestrate/nacl/sign.go generated vendored
View File

@ -6,7 +6,6 @@ package nacl
// #include <sodium.h> // #include <sodium.h>
import "C" import "C"
// sign data detached with secret key sk // sign data detached with secret key sk
func CryptoSignDetached(msg, sk []byte) []byte { func CryptoSignDetached(msg, sk []byte) []byte {
msgbuff := NewBuffer(msg) msgbuff := NewBuffer(msg)
@ -31,7 +30,6 @@ func CryptoSignDetached(msg, sk []byte) []byte {
return nil return nil
} }
// sign data with secret key sk // sign data with secret key sk
// return detached sig // return detached sig
// this uses crypto_sign instead pf crypto_sign_detached // this uses crypto_sign instead pf crypto_sign_detached
@ -45,7 +43,7 @@ func CryptoSignFucky(msg, sk []byte) []byte {
} }
// allocate the signed message buffer // allocate the signed message buffer
sig := malloc(C.crypto_sign_bytes()+msgbuff.size) sig := malloc(C.crypto_sign_bytes() + msgbuff.size)
defer sig.Free() defer sig.Free()
// compute signature // compute signature
siglen := C.ulonglong(0) siglen := C.ulonglong(0)

27
contrib/backends/srndv2/src/srnd/vendor/github.com/majestrate/nacl/stream.go generated vendored
View File

@ -10,7 +10,6 @@ import (
// TOY encrypted authenticated stream protocol like tls // TOY encrypted authenticated stream protocol like tls
var BadHandshake = errors.New("Bad handshake") var BadHandshake = errors.New("Bad handshake")
var ShortWrite = errors.New("short write") var ShortWrite = errors.New("short write")
var ShortRead = errors.New("short read") var ShortRead = errors.New("short read")
@ -47,8 +46,8 @@ func (cs *CryptoStream) Close() (err error) {
func (cs *CryptoStream) Write(data []byte) (n int, err error) { func (cs *CryptoStream) Write(data []byte) (n int, err error) {
// let's split it up // let's split it up
for n < len(data) && err == nil { for n < len(data) && err == nil {
if n + cs.mtu < len(data) { if n+cs.mtu < len(data) {
err = cs.writeSegment(data[n:n+cs.mtu]) err = cs.writeSegment(data[n : n+cs.mtu])
n += cs.mtu n += cs.mtu
} else { } else {
err = cs.writeSegment(data[n:]) err = cs.writeSegment(data[n:])
@ -75,7 +74,7 @@ func (cs *CryptoStream) readSegment() (s []byte, err error) {
var stream_read int var stream_read int
var seg []byte var seg []byte
nl := NounceLen() nl := NounceLen()
msg := make([]byte, cs.mtu + nl) msg := make([]byte, cs.mtu+nl)
stream_read, err = cs.stream.Read(msg) stream_read, err = cs.stream.Read(msg)
seg, err = CryptoBoxOpen(msg[:stream_read], cs.rx_nonce, cs.secret(), cs.remote_pk) seg, err = CryptoBoxOpen(msg[:stream_read], cs.rx_nonce, cs.secret(), cs.remote_pk)
if err == nil { if err == nil {
@ -90,7 +89,7 @@ func (cs *CryptoStream) readSegment() (s []byte, err error) {
func (cs *CryptoStream) writeSegment(data []byte) (err error) { func (cs *CryptoStream) writeSegment(data []byte) (err error) {
var segment []byte var segment []byte
nl := NounceLen() nl := NounceLen()
msg := make([]byte, len(data) + nl) msg := make([]byte, len(data)+nl)
// generate next nounce // generate next nounce
nextNounce := NewBoxNounce() nextNounce := NewBoxNounce()
copy(msg, nextNounce) copy(msg, nextNounce)
@ -138,7 +137,7 @@ func verifyHandshake(hs, pk []byte) (valid bool) {
nl := NounceLen() nl := NounceLen()
if bytes.Equal(pk, hs[ml:ml+pl]) { if bytes.Equal(pk, hs[ml:ml+pl]) {
// check signature // check signature
msg := hs[0:ml+pl+nl] msg := hs[0 : ml+pl+nl]
sig := hs[ml+pl+nl:] sig := hs[ml+pl+nl:]
valid = CryptoVerifyFucky(msg, sig, pk) valid = CryptoVerifyFucky(msg, sig, pk)
} }
@ -150,7 +149,7 @@ func verifyHandshake(hs, pk []byte) (valid bool) {
func getPubkey(hs []byte) (pk []byte) { func getPubkey(hs []byte) (pk []byte) {
ml := len(protocol_magic) ml := len(protocol_magic)
pl := CryptoSignPublicLen() pl := CryptoSignPublicLen()
pk = hs[ml:ml+pl] pk = hs[ml : ml+pl]
return return
} }
@ -176,7 +175,7 @@ func getNounce(hs []byte) (n []byte) {
ml := len(protocol_magic) ml := len(protocol_magic)
pl := CryptoSignPublicLen() pl := CryptoSignPublicLen()
nl := NounceLen() nl := NounceLen()
n = hs[ml+pl:ml+pl+nl] n = hs[ml+pl : ml+pl+nl]
return return
} }
@ -201,7 +200,7 @@ func (cs *CryptoStream) Handshake() (err error) {
copy(cs.remote_pk, pk) copy(cs.remote_pk, pk)
} }
if ! verifyHandshake(buff, cs.remote_pk) { if !verifyHandshake(buff, cs.remote_pk) {
// verification failed // verification failed
err = BadHandshake err = BadHandshake
return return
@ -211,7 +210,6 @@ func (cs *CryptoStream) Handshake() (err error) {
return return
} }
// create a client // create a client
func Client(stream io.ReadWriteCloser, local_sk, remote_pk []byte) (c *CryptoStream) { func Client(stream io.ReadWriteCloser, local_sk, remote_pk []byte) (c *CryptoStream) {
c = &CryptoStream{ c = &CryptoStream{
@ -227,7 +225,6 @@ func Client(stream io.ReadWriteCloser, local_sk, remote_pk []byte) (c *CryptoStr
return c return c
} }
type CryptoConn struct { type CryptoConn struct {
stream *CryptoStream stream *CryptoStream
conn net.Conn conn net.Conn
@ -297,8 +294,8 @@ func (cl *CryptoListener) acceptInbound() {
func (cl *CryptoListener) runChans() { func (cl *CryptoListener) runChans() {
for { for {
select { select {
case c := <- cl.handshake: case c := <-cl.handshake:
go func(){ go func() {
s := &CryptoStream{ s := &CryptoStream{
stream: c, stream: c,
mtu: DefaultMTU, mtu: DefaultMTU,
@ -323,8 +320,8 @@ func (cl *CryptoListener) runChans() {
// accept inbound authenticated and trusted connections // accept inbound authenticated and trusted connections
func (cl *CryptoListener) Accept() (c net.Conn, err error) { func (cl *CryptoListener) Accept() (c net.Conn, err error) {
var ok bool var ok bool
c, ok = <- cl.accepted c, ok = <-cl.accepted
if ! ok { if !ok {
err = Closed err = Closed
} }
return return

1
contrib/backends/srndv2/src/srnd/vendor/github.com/majestrate/nacl/verfiy.go generated vendored
View File

@ -6,7 +6,6 @@ package nacl
// #include <sodium.h> // #include <sodium.h>
import "C" import "C"
// verify a fucky detached sig // verify a fucky detached sig
func CryptoVerifyFucky(msg, sig, pk []byte) bool { func CryptoVerifyFucky(msg, sig, pk []byte) bool {
var smsg []byte var smsg []byte