yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 11:15:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into fix581

Browse source
This commit is contained in:
Neil Alexander 2019-10-24 09:29:29 +01:00
commit 7341fcb9bc
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config.yml
View file

@ -5,7 +5,7 @@ version: 2.1
jobs: jobs:
build-linux: build-linux:
docker: docker:
- image: circleci/golang:1.12.7 - image: circleci/golang:1.13.3
steps: steps:
- checkout - checkout

2
README.md
View file

@ -49,7 +49,7 @@ You may also find other platform-specific wrappers, scripts or tools in the
If you want to build from source, as opposed to installing one of the pre-built If you want to build from source, as opposed to installing one of the pre-built
packages: packages:
1. Install [Go](https://golang.org) (requires Go 1.12 or later) 1. Install [Go](https://golang.org) (requires Go 1.13 or later)
2. Clone this repository 2. Clone this repository
2. Run `./build` 2. Run `./build`

2
go.mod
View file

@ -17,3 +17,5 @@ require (
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
golang.org/x/text v0.3.2 golang.org/x/text v0.3.2
) )
go 1.13

3
src/yggdrasil/tls.go
View file

@ -2,6 +2,7 @@ package yggdrasil
import ( import (
"bytes" "bytes"
"crypto/ed25519"
"crypto/rand" "crypto/rand"
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
@ -12,8 +13,6 @@ import (
"math/big" "math/big"
"net" "net"
"time" "time"
"golang.org/x/crypto/ed25519"
) )
type tcptls struct { type tcptls struct {