checkin this tialing thingamajig and abandon this branch

.circleci/config.yml

@@ -1,26 +0,0 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
-version: 2.1
-jobs:
-  build:
-    working_directory: ~/repo
-    docker:
-      - image: circleci/golang:1.15.8
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - go-mod-v4-{{ checksum "go.sum" }}
-      - run:
-          name: Install Dependencies
-          command: go mod download
-      - save_cache:
-          key: go-mod-v4-{{ checksum "go.sum" }}
-          paths:
-            - "/go/pkg/mod"
-      - run:
-          name: Run tests
-          command: |
-            mkdir -p /tmp/test-reports
-            gotestsum --junitfile /tmp/test-reports/unit-tests.xml
-      - store_test_results:
-          path: /tmp/test-reports

.gitignore

@@ -5,7 +5,4 @@
 *.coverprofile
 *exportable-fuzz.zip
 go-i2p
-*.exe
-.idea/
-router.info
-log
+*.exe*.log

.vscode/launch.json

@@ -0,0 +1,9 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+    
+    ]
+}

CONTRIBUTING.md

@@ -9,6 +9,7 @@ Install required dependencies
 This example assumes Ubuntu 16.04
 
 ```sh
+sudo apt-get install pkg-config libsodium-dev
 go get github.com/hkparker/go-i2p
 go get github.com/Sirupsen/logrus
 go get github.com/stretchr/testify/assert

Makefile

@@ -1,8 +1,5 @@
-RELEASE_TAG=0.0.1
-RELEASE_VERSION=${RELEASE_TAG}
-RELEASE_DESCRIPTION=`cat PASTA.md`
 REPO := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-CGO_ENABLED=0
+
 
 ifdef GOROOT
 	GO = $(GOROOT)/bin/go
@@ -19,27 +16,16 @@ endif
 build: clean $(EXE)
 
 $(EXE):
-	$(GO) build --tags netgo,osusergo -v -o $(EXE)
+	$(GO) build -v -o $(EXE)
 
-test: fmt
-	$(GO) test -v -failfast ./lib/common/...
+test:
+	$(GO) test -failfast ./...
 
 clean:
 	$(GO) clean -v
 
 fmt:
-	find . -name '*.go' -exec gofumpt -w {} \;
+	find . -name '*.go' -exec gofmt -w -s {} \;
 
-info:
-	echo "GOROOT: ${GOROOT}"
-	echo "GO: ${GO}"
-	echo "REPO: ${REPO}"
-
-release:
-	github-release release -u go-i2p -r go-i2p -n "${RELEASE_VERSION}" -t "${RELEASE_TAG}" -d "${RELEASE_DESCRIPTION}" -p
-
-callvis:
-	go-callvis -format svg -focus upgrade -group pkg,type -limit github.com/go-i2p/go-i2p github.com/go-i2p/go-i2p
-
-godoc:
-	find lib -type d -exec bash -c "ls {}/*.go && godocdown -o ./{}/doc.md ./{}" \;
+testcommon:
+	$(GO) test -failfast ./lib/common/...

PASTA.md

@@ -1,18 +0,0 @@
-At long last... something useful
-================================
-
-It's been 2 years of me mostly not having time to work on go-i2p itself since my last update.
-However, after much waiting, this library is actually **useful** for something.
-It is now being used in the `reseed-tools` application to examine RouterInfos prior to including them in reseed bundles.
-Routers that self-report as unreachable or congested will be excluded from future reseed bundles.
-Additionally, routers that self-report an old version will be excluded from reseed bundles.
-This should help new users build better connections faster with the existing, working router implementations.
-
-This is not a working release of a go-i2p router
-------------------------------------------------
-
-It is a numbered version of the go-i2p library, which is pre-release, expressly for use in the `reseed-tools` application.
-The common library works, and so do some of the cryptographic primitives, however the API is unstable and the software itself is certain to have serious bugs outside of a few well-tested areas.
-If you're using it for something other than parsing and analyzing RouterInfos and LeaseSets, you'll probably encounter bugs.
-Please report them to the https://github.com/go-i2p/go-i2p
-Use any part of it at your own risk.

README.md

@@ -4,20 +4,35 @@ A pure Go implementation of the I2P router.
 
 ## Status
 
-go-i2p is in early development. The master branch is being refactored and API's are
-definitely going to change. If you choose to use any part of this code right now,
-please keep up with these changes, as they will not be backward compatible and require
-**Fundamentally** changing any code that treats this as a dependency.
+go-i2p was in early development. Now it's being restructured in some
+fundamental ways, so it's even less done than before(on this branch, for now)
+but when this restructuring is complete, it will be a fully-fledged I2P router
+and library for writing, embedding, and possiblly extending I2P routers in Go
+applications.
+
+The go module is declared as: `github.com/go-i2p/go-i2p`, in order to clone
+anonymously you may use `torsocks` with `go get`(YMMV) or you may clone
+it from git.idk.i2p using:
+
+        #Set your $GOPATH, if it isn't set already then GOPATH=$HOME/go
+        $GOPATH/go/src/i2pgit.org/idk/
+        git clone git@127.0.0.1:idk/go-i2p $GOPATH/go/src/github.com/go-i2p/go-i2p
+        $GOPATH/go/src/github.com/go-i2p/go-i2p
+
+And build with `GO111MODULES=off` or use a `replace` directive in your `go.mod`
+to direct to the local module source. Or you may run your own Go Modules proxy as
+a hidden service. I'll make this about a billion times easier in the near future I
+promise.
 
 ### Implemented Features
 
-- Clients
-  - [ ] Datagrams
-  - [ ] I2CP
-  - [ ] Message routing
-  - [ ] SAM
-  - [ ] Streaming
-  - [ ] Tunnel Manager
+As the application is restructured and moved away from representing I2P data
+structures as byte slices, this chart will be filled in, when the tests pass,
+the item will be checked off. Currently, much of this is partially implemented
+in byte-slice versions and partially implemented as Go Structs. Very little of
+it will work until it's all moved to Go Structs where appropriate. Most of
+this will happen in /lib/common.
+
 - Cryptographic primitives
   - Signing
     - [ ] ECDSA_SHA256_P256
@@ -33,65 +48,62 @@ please keep up with these changes, as they will not be backward compatible and r
     - [ ] RSA_SHA384_3072
     - [ ] RSA_SHA512_4096
     - [ ] Ed25519
-    - [ ] Red25519
-  - [ ] ElGamal
-  - [ ] AES256
-  - [ ] X25519
-  - [ ] ChaCha20/Poly1305
-  - [ ] Elligator2
-  - [ ] HKDF
-  - [ ] HMAC
-  - [/] Noise subsystem
-- End-to-End Crypto
-  - [ ] Garlic messages
-  - [ ] ElGamal/AES+SessionTag
-  - [ ] Ratchet/X25519
+  - [x] ElGamal
+  - [x] AES256
+- Common Structures
+  - Common Type Specification
+    - [x] Integer
+    - [x] Date
+    - [x] String
+    - [x] PublicKey* As interface in lib/crypto
+    - [x] PrivateKey* As interface in lib/crypto
+    - [ ] SessionKey
+    - [ ] SigningPublicKey
+    - [ ] Signature
+    - [x] Hash
+    - [ ] Session Tag
+    - [ ] Tunnel ID
+    - [x] Certificate
+    - [ ] Mapping
+  - Common Structure Specification
+    - [ ] KeysAndCert
+    - [ ] RouterIdentity
+    - [ ] Destination
+    - [ ] Lease
+    - [ ] LeaseSet
+    - [ ] Lease2
+    - [ ] OfflineSigntature
+    - [ ] LeaseSet2Header
+    - [ ] LeaseSet2
+    - [ ] MetaLease
+    - [ ] MetaLeaseSet
+    - [ ] EncryptedLeaseSet
+    - [ ] RouterAddress
+    - [ ] RouterInfo
 - I2NP
   - [ ] Message parsing
   - [ ] Message handling
 - NetDB
-  - [/] Local storage
-  - [/] Persistence to disk
-  - [X] Reseeding
+  - [ ] Local storage
+  - [ ] Persistence to disk
+  - [ ] Reseeding
   - [ ] Lookups
   - [ ] Expiry
   - [ ] Exploration
   - [ ] Publishing
   - [ ] Floodfill
-  - [ ] LS2 and Encrypted Leasesets
 - Transports
-  - [X] Transport manager
+  - [ ] Transport manager
+  - NTCP
+    - [ ] Handshake
+    - [ ] Session tracking
+    - [ ] Automatic session creation
   - NTCP2
     - [ ] Handshake
     - [ ] Session tracking
     - [ ] Automatic session creation
-  - SSU2
-    - [ ] Handshake
-    - [ ] Session tracking
-    - [ ] Automatic session creation
-    - [ ] Peer Tests
-    - [ ] Introducers
-- Tunnels
-    - [ ] Building
-    - [ ] Build Message Crypto (ElGamal)
-    - [ ] Build Message Crypto (ECIES)
-    - [ ] Participating
-    - [ ] Tunnel Message Crypto
-    - [ ] Tunnel Message Fragmentation/Reassembly
-- Common Data Structures
-    - [X] Keys and Cert
-    - [X] Key Certificates
-    - [X] Certificate
-    - [X] Lease
-    - [X] Lease Set
-    - [X] Router Info
-    - [X] Router Identity
-    - [X] Router Address
-    - [X] Session Key
-    - [X] Signature Types
-    - [X] Destination
-    - [X] Data Types
-    - [X] Session Tag
+  - [ ] SSU
+
 
 ## Contributing
 

go.mod

@@ -1,24 +1,9 @@
 module github.com/go-i2p/go-i2p
 
-go 1.22
-
-toolchain go1.22.5
+go 1.16
 
 require (
-	github.com/beevik/ntp v1.4.3
-	github.com/eyedeekay/go-unzip v0.0.0-20240201194209-560d8225b50e
-	github.com/flynn/noise v1.1.0
-	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.9.0
-	go.step.sm/crypto v0.51.2
-	golang.org/x/crypto v0.26.0
-)
-
-require (
-	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/sirupsen/logrus v1.8.1
+	github.com/stretchr/testify v1.7.0
+	golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc
 )

go.sum

@@ -1,45 +1,24 @@
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-github.com/beevik/ntp v1.4.3 h1:PlbTvE5NNy4QHmA4Mg57n7mcFTmr1W1j3gcK7L1lqho=
-github.com/beevik/ntp v1.4.3/go.mod h1:Unr8Zg+2dRn7d8bHFuehIMSvvUYssHMxW3Q5Nx4RW5Q=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/eyedeekay/go-unzip v0.0.0-20240201194209-560d8225b50e h1:NMjWYVkgcQHGOy0/VxU0TU6smrcoxzj9hwDesx2sB0w=
-github.com/eyedeekay/go-unzip v0.0.0-20240201194209-560d8225b50e/go.mod h1:fKfFM3BsOOyjtZmEty7FsGzGabXo8Eb/dHjyIhTtxsE=
-github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg=
-github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.step.sm/crypto v0.51.2 h1:5EiCGIMg7IvQTGmJrwRosbXeprtT80OhoS/PJarg60o=
-go.step.sm/crypto v0.51.2/go.mod h1:QK7czLjN2k+uqVp5CHXxJbhc70kVRSP+0CQF3zsR5M0=
-golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc h1:+q90ECDSAQirdykUN6sPEiBXBsp8Csjcca8Oy7bgLTA=
+golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

lib/bootstrap/bootstrap.go

@@ -1,6 +1,6 @@
 package bootstrap
 
-import "github.com/go-i2p/go-i2p/lib/common/router_info"
+import "github.com/go-i2p/go-i2p/lib/common"
 
 // interface defining a way to bootstrap into the i2p network
 type Bootstrap interface {
@@ -9,5 +9,5 @@ type Bootstrap interface {
 	// if n is 0 then try obtaining as many router infos as possible
 	// returns nil and error if we cannot fetch ANY router infos
 	// returns a channel that yields 1 slice of router infos containing n or fewer router infos, caller must close channel after use
-	GetPeers(n int) (chan []router_info.RouterInfo, error)
+	GetPeers(n int) (chan []common.RouterInfo, error)
 }

lib/bootstrap/doc.go

@@ -1,2 +1,4 @@
+//
 // provides generic interfaces for initial bootstrap into network and network reseeding
+//
 package bootstrap

lib/bootstrap/doc.md

@@ -1,23 +0,0 @@
-# bootstrap
---
-    import "github.com/go-i2p/go-i2p/lib/bootstrap"
-
-provides generic interfaces for initial bootstrap into network and network
-### reseeding
-
-## Usage
-
-#### type Bootstrap
-
-```go
-type Bootstrap interface {
-	// get more peers for bootstrap
-	// try obtaining at most n router infos
-	// if n is 0 then try obtaining as many router infos as possible
-	// returns nil and error if we cannot fetch ANY router infos
-	// returns a channel that yields 1 slice of router infos containing n or fewer router infos, caller must close channel after use
-	GetPeers(n int) (chan []router_info.RouterInfo, error)
-}
-```
-
-interface defining a way to bootstrap into the i2p network

lib/common/base32/base32.go

@@ -1,23 +1,18 @@
-// Package base32 implmenets  utilities for encoding and decoding text using I2P's alphabet
+//
+// base32 encoding using I2P's alphabet
+//
 package base32
 
 import (
 	b32 "encoding/base32"
 )
 
-// I2PEncodeAlphabet is the base32 encoding used throughout I2P.
-// RFC 3548 using lowercase characters.
-const I2PEncodeAlphabet = "abcdefghijklmnopqrstuvwxyz234567"
+var I2PEncoding *b32.Encoding = b32.NewEncoding("abcdefghijklmnopqrstuvwxyz234567")
 
-// I2PEncoding is the standard base32 encoding used through I2P.
-var I2PEncoding *b32.Encoding = b32.NewEncoding(I2PEncodeAlphabet)
-
-// EncodeToString encodes []byte to a base32 string using I2PEncoding
+//
+// Return a go string of the I2P base32
+// encoding of the provided byte slice
+//
 func EncodeToString(data []byte) string {
 	return I2PEncoding.EncodeToString(data)
 }
-
-// DecodeString decodes base64 string to []byte I2PEncoding
-func DecodeString(data string) ([]byte, error) {
-	return I2PEncoding.DecodeString(data)
-}

lib/common/base32/base32_test.go

@@ -1,20 +0,0 @@
-package base32
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestEncodeDecodeNotMangled(t *testing.T) {
-	assert := assert.New(t)
-
-	// Random pangram
-	testInput := []byte("How vexingly quick daft zebras jump!")
-
-	encodedString := EncodeToString(testInput)
-	decodedString, err := DecodeString(encodedString)
-	assert.Nil(err)
-
-	assert.ElementsMatch(testInput, decodedString)
-}

lib/common/base32/doc.md

@@ -1,33 +0,0 @@
-# base32
---
-    import "github.com/go-i2p/go-i2p/lib/common/base32"
-
-Package base32 implmenets utilities for encoding and decoding text using I2P's
-### alphabet
-
-## Usage
-
-```go
-const I2PEncodeAlphabet = "abcdefghijklmnopqrstuvwxyz234567"
-```
-I2PEncodeAlphabet is the base32 encoding used throughout I2P. RFC 3548 using
-lowercase characters.
-
-```go
-var I2PEncoding *b32.Encoding = b32.NewEncoding(I2PEncodeAlphabet)
-```
-I2PEncoding is the standard base32 encoding used through I2P.
-
-#### func  DecodeString
-
-```go
-func DecodeString(data string) ([]byte, error)
-```
-DecodeString decodes base64 string to []byte I2PEncoding
-
-#### func  EncodeToString
-
-```go
-func EncodeToString(data []byte) string
-```
-EncodeToString encodes []byte to a base32 string using I2PEncoding

lib/common/base64/base64.go

@@ -1,23 +1,30 @@
-// Package base64 implmenets  utilities for encoding and decoding text using I2P's alphabet
+//
+// base64 encoding using I2P's alphabet
+//
 package base64
 
 import (
 	b64 "encoding/base64"
 )
 
-// I2PEncodeAlphabet is the base64 encoding used throughout I2P.
-// RFC 4648 with "/"" replaced with "~", and "+" replaced with "-".
-const I2PEncodeAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-~"
+// i2p base64 alphabet
+const Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-~"
 
-// I2PEncoding is the standard base64 encoding used through I2P.
-var I2PEncoding *b64.Encoding = b64.NewEncoding(I2PEncodeAlphabet)
+// i2p base64 encoding
+var I2PEncoding *b64.Encoding = b64.NewEncoding(Alphabet)
 
-// I2PEncoding is the standard base64 encoding used through I2P.
+//
+// Return a go string of the I2P base64
+// encoding of the provided byte slice
+//
 func EncodeToString(data []byte) string {
 	return I2PEncoding.EncodeToString(data)
 }
 
-// DecodeString decodes base64 string to []byte I2PEncoding
-func DecodeString(str string) ([]byte, error) {
+//
+// decode string using i2p base64 encoding
+// returns error if data is malfromed
+//
+func DecodeFromString(str string) (d []byte, err error) {
 	return I2PEncoding.DecodeString(str)
 }

lib/common/base64/base64_test.go

@@ -1,20 +0,0 @@
-package base64
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestEncodeDecodeNotMangled(t *testing.T) {
-	assert := assert.New(t)
-
-	// Random pangram
-	testInput := []byte("Glib jocks quiz nymph to vex dwarf.")
-
-	encodedString := EncodeToString(testInput)
-	decodedString, err := DecodeString(encodedString)
-	assert.Nil(err)
-
-	assert.ElementsMatch(testInput, decodedString)
-}

lib/common/base64/doc.md

@@ -1,33 +0,0 @@
-# base64
---
-    import "github.com/go-i2p/go-i2p/lib/common/base64"
-
-Package base64 implmenets utilities for encoding and decoding text using I2P's
-### alphabet
-
-## Usage
-
-```go
-const I2PEncodeAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-~"
-```
-I2PEncodeAlphabet is the base64 encoding used throughout I2P. RFC 4648 with "/""
-replaced with "~", and "+" replaced with "-".
-
-```go
-var I2PEncoding *b64.Encoding = b64.NewEncoding(I2PEncodeAlphabet)
-```
-I2PEncoding is the standard base64 encoding used through I2P.
-
-#### func  DecodeString
-
-```go
-func DecodeString(str string) ([]byte, error)
-```
-DecodeString decodes base64 string to []byte I2PEncoding
-
-#### func  EncodeToString
-
-```go
-func EncodeToString(data []byte) string
-```
-I2PEncoding is the standard base64 encoding used through I2P.

lib/common/certificate.go

@@ -0,0 +1,220 @@
+package common
+
+/*
+I2P Certificate
+https://geti2p.net/spec/common-structures#certificate
+Accurate for version 0.9.24
+
++----+----+----+----+----+-//
+|type| length  | payload
++----+----+----+----+----+-//
+
+type :: Integer
+        length -> 1 byte
+
+        case 0 -> NULL
+        case 1 -> HASHCASH
+        case 2 -> HIDDEN
+        case 3 -> SIGNED
+        case 4 -> MULTIPLE
+        case 5 -> KEY
+
+length :: Integer
+          length -> 2 bytes
+
+payload :: data
+           length -> $length bytes
+*/
+
+import (
+	"errors"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// Certificate Types
+const (
+	CERT_NULL = iota
+	CERT_HASHCASH
+	CERT_HIDDEN
+	CERT_SIGNED
+	CERT_MULTIPLE
+	CERT_KEY
+)
+
+// Minimum size of a valid Certificate
+const (
+	CERT_MIN_SIZE = 3
+)
+
+type CertificateInterface interface {
+	Cert() []byte
+	Length() (length int, err error)
+	Data() (data []byte, err error)
+	Type() (cert_type int, type_bytes []byte, err error)
+	SignatureSize() (size int)
+}
+
+type Certificate struct {
+	CertType  *Integer
+	CertLen   *Integer
+	CertBytes []byte
+}
+
+var ci CertificateInterface = &Certificate{}
+
+func (certificate Certificate) SignatureSize() (size int) {
+	return 40
+}
+
+func (certificate Certificate) Cert() []byte {
+	var ret []byte
+	ret = append(ret, certificate.CertType.Bytes()...)
+	l, _ := certificate.Length()
+	//if err != nil && err.Error() != "certificate parsing warning: certificate data is shorter than specified by length" {
+	//}
+	data, _ := certificate.Data()
+	if l != 0 && len(data) != 0 {
+		ret = append(ret, certificate.CertLen.Bytes()...)
+		ret = append(ret, data...)
+	} else {
+		ret = append(ret, certificate.CertLen.Bytes()...)
+	}
+	//log.Println("\n\n CERTIFICATE: ", ret, l+CERT_MIN_SIZE, err)
+	return ret //[:l+CERT_MIN_SIZE]
+}
+
+//
+// Return the Certificate Type specified in the first byte of the Certificate,
+// and an error if the certificate is shorter than the minimum certificate size.
+//
+func (certificate Certificate) Type() (cert_type int, type_bytes []byte, err error) {
+	return certificate.CertType.Value(), certificate.CertType.Bytes(), nil
+}
+
+//
+// Look up the length of the Certificate, reporting errors if the certificate is
+// shorter than the minimum certificate size or if the reported length doesn't
+// match the provided data.
+//
+func (certificate Certificate) Length() (length int, err error) {
+	if certificate.CertLen.Value() < 1 {
+		log.WithFields(log.Fields{
+			"at":                       "(Certificate) Length",
+			"certificate_bytes_length": certificate.CertLen,
+			"certificate_min_size":     CERT_MIN_SIZE - 1,
+			"reason":                   "certificate is too short",
+		}).Warn("certificate format warning")
+		err = errors.New("error parsing certificate length: certificate is too short")
+	}
+	if certificate.CertLen.Value() > len(certificate.CertBytes) {
+		log.WithFields(log.Fields{
+			"at":                        "(Certificate) Length",
+			"certificate_bytes_length":  certificate.CertLen,
+			"certificate_actual_length": len(certificate.CertBytes),
+			"reason":                    "certificate data is shorter than specified by length",
+		}).Warn("certificate format warning")
+		err = errors.New("certificate parsing warning: certificate data is shorter than specified by length")
+		length = certificate.CertLen.Value()
+	}
+	if certificate.CertLen.Value() < len(certificate.CertBytes) {
+		log.WithFields(log.Fields{
+			"at":                        "(Certificate) Length",
+			"certificate_bytes_length":  certificate.CertLen,
+			"certificate_actual_length": len(certificate.CertBytes),
+			"reason":                    "certificate contains data beyond length",
+		}).Warn("certificate format warning")
+		err = errors.New("certificate parsing warning: certificate data is longer than specified by length")
+		length = certificate.CertLen.Value()
+	}
+	if err != nil {
+		return
+	}
+	length = certificate.CertLen.Value()
+	return
+}
+
+//
+// Return the Certificate data and any errors encountered parsing the Certificate.
+//
+func (certificate Certificate) Data() (data []byte, err error) {
+	_, err = certificate.Length()
+	data = certificate.CertBytes
+	if err != nil {
+		switch err.Error() {
+		case "error parsing certificate length: certificate is too short":
+			return
+		case "certificate parsing warning: certificate data is shorter than specified by length":
+			data = certificate.CertBytes
+			return
+		case "certificate parsing warning: certificate data is longer than specified by length":
+			data = certificate.CertBytes[:certificate.CertLen.Value()]
+			return
+		}
+	}
+	return
+}
+
+//
+// Read a Certificate from a slice of bytes, returning any extra data on the end of the slice
+// and any errors if a valid Certificate could not be read.
+//
+func ReadCertificate(data []byte) (certificate *Certificate, remainder []byte, err error) {
+	certificate = &Certificate{}
+	certificate.CertType, err = NewInteger(data[0:1])
+	if err != nil {
+		log.WithFields(log.Fields{
+			"at":           "(Certificate) ReadCertificate",
+			"certificate":  certificate,
+			"data":         data,
+			"reason":       "error parsing certificate type",
+			"error":        err,
+			"error_reason": err.Error(),
+		}).Warn("certificate format warning")
+	}
+	certificate.CertLen = &Integer{}
+	cert_len := len(data)
+
+	if cert_len < CERT_MIN_SIZE {
+		log.WithFields(log.Fields{
+			"at":                       "(Certificate) ReadCertificate",
+			"certificate_bytes_length": cert_len,
+			"certificate_min_size":     CERT_MIN_SIZE,
+			"reason":                   "certificate is too short",
+		}).Warn("certificate format warning")
+		err = errors.New("error parsing certificate length: certificate is too short")
+		return
+	} else {
+		certificate.CertLen, err = NewInteger(data[1:CERT_MIN_SIZE])
+		//		_, err = certificate.Type()
+		//log.Println("Calculated len AT LEN", cert_len, "Stated len AT LEN", certificate.CertLen.Value())
+		if err != nil {
+			//return
+			log.WithFields(log.Fields{
+				"at":                       "(Certificate) ReadCertificate",
+				"certificate_bytes_length": cert_len,
+				"certificate_min_size":     CERT_MIN_SIZE,
+				"reason":                   "certificate size is invalid",
+			}).Warn("certificate format warning")
+			//err = errors.New("error parsing certificate type: certificate type is invalid")
+		}
+		certificate.CertBytes = data[CERT_MIN_SIZE:]
+		_, err = certificate.Length()
+		if err != nil {
+			switch err.Error() {
+			case "error parsing certificate length: certificate is too short":
+				certificate.CertLen, err = NewInteger([]byte{00000000})
+				return
+			case "certificate parsing warning: certificate data is shorter than specified by length":
+				return
+			case "certificate parsing warning: certificate data is longer than specified by length":
+				certificate.CertBytes = data[CERT_MIN_SIZE:]
+				l, _ := certificate.Length()
+				remainder = data[CERT_MIN_SIZE+l:]
+				return
+			}
+		}
+	}
+
+	return
+}

lib/common/certificate/certificate.go

@@ -1,176 +0,0 @@
-// Package certificate implements the certificate common-structure of I2P.
-
-package certificate
-
-import (
-	"fmt"
-
-	log "github.com/sirupsen/logrus"
-
-	. "github.com/go-i2p/go-i2p/lib/common/data"
-)
-
-// Certificate Types
-const (
-	CERT_NULL = iota
-	CERT_HASHCASH
-	CERT_HIDDEN
-	CERT_SIGNED
-	CERT_MULTIPLE
-	CERT_KEY
-)
-
-// CERT_MIN_SIZE is the minimum size of a valid Certificate in []byte
-// 1 byte for type
-// 2 bytes for payload length
-const CERT_MIN_SIZE = 3
-
-/*
-[I2P Certificate]
-Accurate for version 0.9.49
-
-Description
-A certifificate is a container for various receipts of proof of works used throughout the I2P network.
-
-Contents
-1 byte Integer specifying certificate type, followed by a 2 byte Integer specifying the size of the certificate playload, then that many bytes.
-
-+----+----+----+----+----+-//
-|type| length  | payload
-+----+----+----+----+----+-//
-
-type :: Integer
-        length -> 1 byte
-
-        case 0 -> NULL
-        case 1 -> HASHCASH
-        case 2 -> HIDDEN
-        case 3 -> SIGNED
-        case 4 -> MULTIPLE
-        case 5 -> KEY
-
-length :: Integer
-          length -> 2 bytes
-
-payload :: data
-           length -> $length bytes
-*/
-
-// Certificate is the representation of an I2P Certificate.
-//
-// https://geti2p.net/spec/common-structures#certificate
-type Certificate struct {
-	kind    Integer
-	len     Integer
-	payload []byte
-}
-
-// RawBytes returns the entire certificate in []byte form, includes excess payload data.
-func (c *Certificate) RawBytes() []byte {
-	bytes := c.kind.Bytes()
-	bytes = append(bytes, c.len.Bytes()...)
-	bytes = append(bytes, c.payload...)
-	return bytes
-}
-
-// ExcessBytes returns the excess bytes in a certificate found after the specified payload length.
-func (c *Certificate) ExcessBytes() []byte {
-	if len(c.payload) >= c.len.Int() {
-		return c.payload[c.len.Int():]
-	}
-	return nil
-}
-
-// Bytes returns the entire certificate in []byte form, trims payload to specified length.
-func (c *Certificate) Bytes() []byte {
-	bytes := c.kind.Bytes()
-	bytes = append(bytes, c.len.Bytes()...)
-	bytes = append(bytes, c.Data()...)
-	return bytes
-}
-
-func (c *Certificate) length() (cert_len int) {
-	cert_len = len(c.Bytes())
-	return
-}
-
-// Type returns the Certificate type specified in the first byte of the Certificate,
-func (c *Certificate) Type() (cert_type int) {
-	cert_type = c.kind.Int()
-	return
-}
-
-// Length returns the payload length of a Certificate.
-func (c *Certificate) Length() (length int) {
-	length = c.len.Int()
-	return
-}
-
-// Data returns the payload of a Certificate, payload is trimmed to the specified length.
-func (c *Certificate) Data() (data []byte) {
-	lastElement := c.Length()
-	if lastElement > len(c.payload) {
-		data = c.payload
-	} else {
-		data = c.payload[0:lastElement]
-	}
-	return
-}
-
-// NewCertificate creates a new Certficiate from []byte
-// returns err if the certificate is too short or if the payload doesn't match specified length.
-func NewCertificate(data []byte) (certificate Certificate, err error) {
-	certificate = Certificate{}
-	switch len(data) {
-	case 0:
-		certificate.kind = Integer([]byte{0})
-		certificate.len = Integer([]byte{0})
-		log.WithFields(log.Fields{
-			"at":                       "(Certificate) NewCertificate",
-			"certificate_bytes_length": len(data),
-			"reason":                   "too short (len < CERT_MIN_SIZE)" + fmt.Sprintf("%d", certificate.kind.Int()),
-		}).Error("invalid certificate, empty")
-		err = fmt.Errorf("error parsing certificate: certificate is empty")
-		return
-	case 1, 2:
-		certificate.kind = Integer(data[0 : len(data)-1])
-		certificate.len = Integer([]byte{0})
-		log.WithFields(log.Fields{
-			"at":                       "(Certificate) NewCertificate",
-			"certificate_bytes_length": len(data),
-			"reason":                   "too short (len < CERT_MIN_SIZE)" + fmt.Sprintf("%d", certificate.kind.Int()),
-		}).Error("invalid certificate, too short")
-		err = fmt.Errorf("error parsing certificate: certificate is too short")
-		return
-	default:
-		certificate.kind = Integer(data[0:1])
-		certificate.len = Integer(data[1:3])
-		payleng := len(data) - CERT_MIN_SIZE
-		certificate.payload = data[CERT_MIN_SIZE:]
-		if certificate.len.Int() > len(data)-CERT_MIN_SIZE {
-			err = fmt.Errorf("certificate parsing warning: certificate data is shorter than specified by length")
-			log.WithFields(log.Fields{
-				"at":                         "(Certificate) NewCertificate",
-				"certificate_bytes_length":   certificate.len.Int(),
-				"certificate_payload_length": payleng,
-				"data_bytes:":                string(data),
-				"kind_bytes":                 data[0:1],
-				"len_bytes":                  data[1:3],
-				"reason":                     err.Error(),
-			}).Error("invalid certificate, shorter than specified by length")
-			return
-		}
-		return
-	}
-}
-
-// ReadCertificate creates a Certificate from []byte and returns any ExcessBytes at the end of the input.
-// returns err if the certificate could not be read.
-func ReadCertificate(data []byte) (certificate Certificate, remainder []byte, err error) {
-	certificate, err = NewCertificate(data)
-	if err != nil && err.Error() == "certificate parsing warning: certificate data is longer than specified by length" {
-		err = nil
-	}
-	remainder = certificate.ExcessBytes()
-	return
-}

lib/common/certificate/doc.md

@@ -1,98 +0,0 @@
-# certificate
---
-    import "github.com/go-i2p/go-i2p/lib/common/certificate"
-
-
-## Usage
-
-```go
-const (
-	CERT_NULL = iota
-	CERT_HASHCASH
-	CERT_HIDDEN
-	CERT_SIGNED
-	CERT_MULTIPLE
-	CERT_KEY
-)
-```
-Certificate Types
-
-```go
-const CERT_MIN_SIZE = 3
-```
-CERT_MIN_SIZE is the minimum size of a valid Certificate in []byte 1 byte for
-type 2 bytes for payload length
-
-#### type Certificate
-
-```go
-type Certificate struct {
-}
-```
-
-Certificate is the representation of an I2P Certificate.
-
-https://geti2p.net/spec/common-structures#certificate
-
-#### func  NewCertificate
-
-```go
-func NewCertificate(data []byte) (certificate Certificate, err error)
-```
-NewCertificate creates a new Certficiate from []byte returns err if the
-certificate is too short or if the payload doesn't match specified length.
-
-#### func  ReadCertificate
-
-```go
-func ReadCertificate(data []byte) (certificate Certificate, remainder []byte, err error)
-```
-ReadCertificate creates a Certificate from []byte and returns any ExcessBytes at
-the end of the input. returns err if the certificate could not be read.
-
-#### func (*Certificate) Bytes
-
-```go
-func (c *Certificate) Bytes() []byte
-```
-Bytes returns the entire certificate in []byte form, trims payload to specified
-length.
-
-#### func (*Certificate) Data
-
-```go
-func (c *Certificate) Data() (data []byte)
-```
-Data returns the payload of a Certificate, payload is trimmed to the specified
-length.
-
-#### func (*Certificate) ExcessBytes
-
-```go
-func (c *Certificate) ExcessBytes() []byte
-```
-ExcessBytes returns the excess bytes in a certificate found after the specified
-payload length.
-
-#### func (*Certificate) Length
-
-```go
-func (c *Certificate) Length() (length int)
-```
-Length returns the payload length of a Certificate.
-
-#### func (*Certificate) RawBytes
-
-```go
-func (c *Certificate) RawBytes() []byte
-```
-RawBytes returns the entire certificate in []byte form, includes excess payload
-data.
-
-#### func (*Certificate) Type
-
-```go
-func (c *Certificate) Type() (cert_type int)
-```
-Type returns the Certificate type specified in the first byte of the
-Certificate,

lib/common/certificate_test.go

@@ -1,4 +1,4 @@
-package certificate
+package common
 
 import (
 	"testing"
@@ -10,8 +10,11 @@ func TestCertificateTypeIsFirstByte(t *testing.T) {
 	assert := assert.New(t)
 
 	bytes := []byte{0x03, 0x00, 0x00}
-	certificate, err := NewCertificate(bytes)
-	cert_type := certificate.Type()
+	certificate, _, err := ReadCertificate(bytes)
+	if err != nil {
+		t.Log(err)
+	}
+	cert_type, _, err := certificate.Type()
 
 	assert.Equal(cert_type, 3, "certificate.Type() should be the first bytes in a certificate")
 	assert.Nil(err)
@@ -21,11 +24,14 @@ func TestCertificateLengthCorrect(t *testing.T) {
 	assert := assert.New(t)
 
 	bytes := []byte{0x03, 0x00, 0x02, 0xff, 0xff}
-	certificate, err := NewCertificate(bytes)
-	cert_len := certificate.Length()
+	certificate, _, err := ReadCertificate(bytes)
+	assert.Nil(err, "ReadCertificate() should not return an error with valid data")
+
+	cert_len, err := certificate.Length()
+	assert.Nil(err, "ReadCertificate() should not return an error with valid data")
 
 	assert.Equal(cert_len, 2, "certificate.Length() should return integer from second two bytes")
-	assert.Nil(err)
+	assert.Nil(err, "ReadCertificate() should not return an error with valid data")
 }
 
 func TestCertificateLengthErrWhenTooShort(t *testing.T) {
@@ -33,11 +39,14 @@ func TestCertificateLengthErrWhenTooShort(t *testing.T) {
 
 	bytes := []byte{0x03, 0x01}
 	certificate, _, err := ReadCertificate(bytes)
-	cert_len := certificate.Length()
+	if assert.NotNil(err) {
+		assert.Equal("error parsing certificate length: certificate is too short", err.Error(), "correct error message should be returned")
+	}
+	cert_len, err := certificate.Length()
 
 	assert.Equal(cert_len, 0, "certificate.Length() did not return zero length for missing length data")
 	if assert.NotNil(err) {
-		assert.Equal("error parsing certificate: certificate is too short", err.Error(), "correct error message should be returned")
+		assert.Equal("error parsing certificate length: certificate is too short", err.Error(), "correct error message should be returned")
 	}
 }
 
@@ -45,8 +54,15 @@ func TestCertificateLengthErrWhenDataTooShort(t *testing.T) {
 	assert := assert.New(t)
 
 	bytes := []byte{0x03, 0x00, 0x02, 0xff}
-	certificate, err := NewCertificate(bytes)
-	cert_len := certificate.Length()
+	certificate, _, err := ReadCertificate(bytes)
+	if assert.NotNil(err) {
+		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error(), "correct error message should be returned")
+	}
+
+	cert_len, err := certificate.Length()
+	if assert.NotNil(err) {
+		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error(), "correct error message should be returned")
+	}
 
 	assert.Equal(cert_len, 2, "certificate.Length() did not return indicated length when data was actually missing")
 	if assert.NotNil(err) {
@@ -58,25 +74,34 @@ func TestCertificateDataWhenCorrectSize(t *testing.T) {
 	assert := assert.New(t)
 
 	bytes := []byte{0x03, 0x00, 0x01, 0xaa}
-	certificate, err := NewCertificate(bytes)
-	cert_data := certificate.Data()
+	certificate, _, err := ReadCertificate(bytes)
+	assert.Nil(err, "certificate.Data() returned error with valid data")
+	cert_len, err := certificate.Length()
 
 	assert.Nil(err, "certificate.Data() returned error with valid data")
-	cert_len := len(cert_data)
+
 	assert.Equal(cert_len, 1, "certificate.Length() did not return indicated length when data was valid")
-	assert.Equal(170, int(cert_data[0]), "certificate.Data() returned incorrect data")
+	data, _ := NewInteger(certificate.CertBytes)
+	assert.Equal(170, data.Value(), "certificate.Data() returned incorrect data")
 }
 
 func TestCertificateDataWhenTooLong(t *testing.T) {
 	assert := assert.New(t)
 
 	bytes := []byte{0x03, 0x00, 0x02, 0xff, 0xff, 0xaa, 0xaa}
-	certificate, _, _ := ReadCertificate(bytes)
-	cert_data := certificate.Data()
+	certificate, _, err := ReadCertificate(bytes)
+	if assert.NotNil(err) {
+		assert.Equal("certificate parsing warning: certificate data is longer than specified by length", err.Error(), "correct error message should be returned")
+	}
+
+	cert_len, err := certificate.Length()
+
+	if assert.NotNil(err) {
+		assert.Equal("certificate parsing warning: certificate data is longer than specified by length", err.Error(), "correct error message should be returned")
+	}
 
-	cert_len := certificate.Length() // len(cert_data)
 	assert.Equal(cert_len, 2, "certificate.Length() did not return indicated length when data was too long")
-	if cert_data[0] != 0xff || cert_data[1] != 0xff {
+	if certificate.CertBytes[0] != 0xff || certificate.CertBytes[1] != 0xff {
 		t.Fatal("certificate.Data() returned incorrect data when data was too long")
 	}
 }
@@ -85,8 +110,11 @@ func TestCertificateDataWhenTooShort(t *testing.T) {
 	assert := assert.New(t)
 
 	bytes := []byte{0x03, 0x00, 0x02, 0xff}
-	certificate, err := NewCertificate(bytes)
-	cert_data := certificate.Data()
+	certificate, _, err := ReadCertificate(bytes)
+	if assert.NotNil(err) {
+		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error(), "correct error message should be returned")
+	}
+	cert_data, err := certificate.Data()
 
 	if assert.NotNil(err) {
 		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error(), "correct error message should be returned")
@@ -102,7 +130,8 @@ func TestReadCertificateWithCorrectData(t *testing.T) {
 	bytes := []byte{0x00, 0x00, 0x02, 0xff, 0xff}
 	cert, remainder, err := ReadCertificate(bytes)
 
-	assert.Equal(cert.length(), 5, "ReadCertificate() did not return correct amount of data for valid certificate")
+	t.Log("CERT IS:", cert.Cert())
+	assert.Equal(len(cert.Cert()), 5, "ReadCertificate() did not return correct amount of data for valid certificate")
 	assert.Equal(len(remainder), 0, "ReadCertificate() did not return a zero length remainder on a valid certificate")
 	assert.Nil(err, "ReadCertificate() should not return an error with valid data")
 }
@@ -113,7 +142,7 @@ func TestReadCertificateWithDataTooShort(t *testing.T) {
 	bytes := []byte{0x00, 0x00, 0x02, 0xff}
 	cert, remainder, err := ReadCertificate(bytes)
 
-	assert.Equal(cert.length(), 4, "ReadCertificate() did not return correct amount of data for certificate with missing data")
+	assert.Equal(len(cert.Cert()), 4, "ReadCertificate() did not return correct amount of data for certificate with missing data")
 	assert.Equal(len(remainder), 0, "ReadCertificate() did not return a zero length remainder on certificate with missing data")
 	if assert.NotNil(err) {
 		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error(), "correct error message should be returned")
@@ -126,10 +155,10 @@ func TestReadCertificateWithRemainder(t *testing.T) {
 	bytes := []byte{0x00, 0x00, 0x02, 0xff, 0xff, 0x01}
 	cert, remainder, err := ReadCertificate(bytes)
 
-	assert.Equal(cert.length(), 5, "ReadCertificate() did not return correct amount of data for certificate with extra data")
+	assert.Equal(len(cert.Cert()), 5, "ReadCertificate() did not return correct amount of data for certificate with extra data")
 	assert.Equal(len(remainder), 1, "ReadCertificate() returned incorrect length remainder on certificate with extra data")
-	//	assert.Equal(1, int(remainder[0]), "ReadCertificate() did not return correct remainder value")
-	assert.Nil(err)
+	assert.Equal(1, int(remainder[0]), "ReadCertificate() did not return correct remainder value")
+	assert.NotNil(err)
 }
 
 func TestReadCertificateWithInvalidLength(t *testing.T) {
@@ -138,9 +167,9 @@ func TestReadCertificateWithInvalidLength(t *testing.T) {
 	bytes := []byte{0x00, 0x00}
 	cert, remainder, err := ReadCertificate(bytes)
 
-	assert.Equal(cert.length(), 2, "ReadCertificate() should populate the certificate with the provided data even when invalid")
+	assert.Equal(len(cert.Cert()), 2, "ReadCertificate() should populate the certificate with the provided data even when invalid")
 	assert.Equal(len(remainder), 0, "ReadCertificate() returned non-zero length remainder on invalid certificate")
 	if assert.NotNil(err) {
-		assert.Equal("error parsing certificate: certificate is too short", err.Error(), "correct error message should be returned")
+		assert.Equal("error parsing certificate length: certificate is too short", err.Error(), "correct error message should be returned")
 	}
 }

lib/common/data/date.go

@@ -1,71 +0,0 @@
-// Package data implements common data structures used in higher level structures.
-package data
-
-import (
-	"errors"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-)
-
-// DATE_SIZE is the length in bytes of an I2P Date.
-const DATE_SIZE = 8
-
-/*
-[I2P Date]
-Accurate for version 0.9.49
-
-Description
-The number of milliseconds since midnight on Januyar 1, 1970 in the GMT timezone.
-If the number is 0, the date is undefined or null.
-
-Contents
-8 byte Integer
-*/
-
-// Date is the represenation of an I2P Date.
-//
-// https://geti2p.net/spec/common-structures#date
-type Date [8]byte
-
-// Bytes returns the raw []byte content of a Date.
-func (i Date) Bytes() []byte {
-	return i[:]
-}
-
-// Int returns the Date as a Go integer.
-func (i Date) Int() int {
-	return intFromBytes(i.Bytes())
-}
-
-// Time takes the value stored in date as an 8 byte big-endian integer representing the
-// number of milliseconds since the beginning of unix time and converts it to a Go time.Time
-// struct.
-func (date Date) Time() (date_time time.Time) {
-	seconds := Integer(date[:])
-	date_time = time.Unix(0, int64(seconds.Int()*1000000))
-	return
-}
-
-// ReadDate creates a Date from []byte using the first DATE_SIZE bytes.
-// Any data after DATE_SIZE is returned as a remainder.
-func ReadDate(data []byte) (date Date, remainder []byte, err error) {
-	if len(data) < 8 {
-		log.WithFields(log.Fields{
-			"data": data,
-		}).Error("ReadDate: data is too short")
-		err = errors.New("ReadDate: data is too short")
-		return
-	}
-	copy(date[:], data[:8])
-	remainder = data[8:]
-	return
-}
-
-// NewDate creates a new Date from []byte using ReadDate.
-// Returns a pointer to Date unlike ReadDate.
-func NewDate(data []byte) (date *Date, remainder []byte, err error) {
-	objdate, remainder, err := ReadDate(data)
-	date = &objdate
-	return
-}

lib/common/data/doc.md

@@ -1,297 +0,0 @@
-# data
---
-    import "github.com/go-i2p/go-i2p/lib/common/data"
-
-Package data implements common data structures used in higher level structures.
-
-## Usage
-
-```go
-const DATE_SIZE = 8
-```
-DATE_SIZE is the length in bytes of an I2P Date.
-
-```go
-const MAX_INTEGER_SIZE = 8
-```
-MAX_INTEGER_SIZE is the maximum length of an I2P integer in bytes.
-
-```go
-const STRING_MAX_SIZE = 255
-```
-STRING_MAX_SIZE is the maximum number of bytes that can be stored in an I2P
-string
-
-#### func  PrintErrors
-
-```go
-func PrintErrors(errs []error)
-```
-PrintErrors prints a formatted list of errors to the console.
-
-#### func  WrapErrors
-
-```go
-func WrapErrors(errs []error) error
-```
-WrapErrors compiles a slice of errors and returns them wrapped together as a
-single error.
-
-#### type Date
-
-```go
-type Date [8]byte
-```
-
-Date is the represenation of an I2P Date.
-
-https://geti2p.net/spec/common-structures#date
-
-#### func  NewDate
-
-```go
-func NewDate(data []byte) (date *Date, remainder []byte, err error)
-```
-NewDate creates a new Date from []byte using ReadDate. Returns a pointer to Date
-unlike ReadDate.
-
-#### func  ReadDate
-
-```go
-func ReadDate(data []byte) (date Date, remainder []byte, err error)
-```
-ReadDate creates a Date from []byte using the first DATE_SIZE bytes. Any data
-after DATE_SIZE is returned as a remainder.
-
-#### func (Date) Bytes
-
-```go
-func (i Date) Bytes() []byte
-```
-Bytes returns the raw []byte content of a Date.
-
-#### func (Date) Int
-
-```go
-func (i Date) Int() int
-```
-Int returns the Date as a Go integer.
-
-#### func (Date) Time
-
-```go
-func (date Date) Time() (date_time time.Time)
-```
-Time takes the value stored in date as an 8 byte big-endian integer representing
-the number of milliseconds since the beginning of unix time and converts it to a
-Go time.Time struct.
-
-#### type Hash
-
-```go
-type Hash [32]byte
-```
-
-Hash is the represenation of an I2P Hash.
-
-https://geti2p.net/spec/common-structures#hash
-
-#### func  HashData
-
-```go
-func HashData(data []byte) (h Hash)
-```
-HashData returns the SHA256 sum of a []byte input as Hash.
-
-#### func  HashReader
-
-```go
-func HashReader(r io.Reader) (h Hash, err error)
-```
-HashReader returns the SHA256 sum from all data read from an io.Reader. return
-error if one occurs while reading from reader
-
-#### func (Hash) Bytes
-
-```go
-func (h Hash) Bytes() [32]byte
-```
-
-#### type I2PString
-
-```go
-type I2PString []byte
-```
-
-I2PString is the represenation of an I2P String.
-
-https://geti2p.net/spec/common-structures#string
-
-#### func  ReadI2PString
-
-```go
-func ReadI2PString(data []byte) (str I2PString, remainder []byte, err error)
-```
-ReadI2PString returns I2PString from a []byte. The remaining bytes after the
-specified length are also returned. Returns a list of errors that occurred
-during parsing.
-
-#### func  ToI2PString
-
-```go
-func ToI2PString(data string) (str I2PString, err error)
-```
-ToI2PString converts a Go string to an I2PString. Returns error if the string
-exceeds STRING_MAX_SIZE.
-
-#### func (I2PString) Data
-
-```go
-func (str I2PString) Data() (data string, err error)
-```
-Data returns the I2PString content as a string trimmed to the specified length
-and not including the length byte. Returns error encountered by Length.
-
-#### func (I2PString) Length
-
-```go
-func (str I2PString) Length() (length int, err error)
-```
-Length returns the length specified in the first byte. Returns error if the
-specified does not match the actual length or the string is otherwise invalid.
-
-#### type Integer
-
-```go
-type Integer []byte
-```
-
-Integer is the represenation of an I2P Integer.
-
-https://geti2p.net/spec/common-structures#integer
-
-#### func  NewInteger
-
-```go
-func NewInteger(bytes []byte, size int) (integer *Integer, remainder []byte, err error)
-```
-NewInteger creates a new Integer from []byte using ReadInteger. Limits the
-length of the created Integer to MAX_INTEGER_SIZE. Returns a pointer to Integer
-unlike ReadInteger.
-
-#### func  NewIntegerFromInt
-
-```go
-func NewIntegerFromInt(value int, size int) (integer *Integer, err error)
-```
-NewIntegerFromInt creates a new Integer from a Go integer of a specified []byte
-length.
-
-#### func  ReadInteger
-
-```go
-func ReadInteger(bytes []byte, size int) (Integer, []byte)
-```
-ReadInteger returns an Integer from a []byte of specified length. The remaining
-bytes after the specified length are also returned.
-
-#### func (Integer) Bytes
-
-```go
-func (i Integer) Bytes() []byte
-```
-Bytes returns the raw []byte content of an Integer.
-
-#### func (Integer) Int
-
-```go
-func (i Integer) Int() int
-```
-Int returns the Date as a Go integer
-
-#### type Mapping
-
-```go
-type Mapping struct {
-}
-```
-
-Mapping is the represenation of an I2P Mapping.
-
-https://geti2p.net/spec/common-structures#mapping
-
-#### func  GoMapToMapping
-
-```go
-func GoMapToMapping(gomap map[string]string) (mapping *Mapping, err error)
-```
-GoMapToMapping converts a Go map of unformatted strings to *Mapping.
-
-#### func  NewMapping
-
-```go
-func NewMapping(bytes []byte) (values *Mapping, remainder []byte, err []error)
-```
-NewMapping creates a new *Mapping from []byte using ReadMapping. Returns a
-pointer to Mapping unlike ReadMapping.
-
-#### func  ReadMapping
-
-```go
-func ReadMapping(bytes []byte) (mapping Mapping, remainder []byte, err []error)
-```
-ReadMapping returns Mapping from a []byte. The remaining bytes after the
-specified length are also returned. Returns a list of errors that occurred
-during parsing.
-
-#### func  ValuesToMapping
-
-```go
-func ValuesToMapping(values MappingValues) *Mapping
-```
-ValuesToMapping creates a *Mapping using MappingValues. The values are sorted in
-the order defined in mappingOrder.
-
-#### func (*Mapping) Data
-
-```go
-func (mapping *Mapping) Data() []byte
-```
-Data returns a Mapping in its []byte form.
-
-#### func (*Mapping) HasDuplicateKeys
-
-```go
-func (mapping *Mapping) HasDuplicateKeys() bool
-```
-HasDuplicateKeys returns true if two keys in a mapping are identical.
-
-#### func (Mapping) Values
-
-```go
-func (mapping Mapping) Values() MappingValues
-```
-Values returns the values contained in a Mapping as MappingValues.
-
-#### type MappingValues
-
-```go
-type MappingValues [][2]I2PString
-```
-
-MappingValues represents the parsed key value pairs inside of an I2P Mapping.
-
-#### func  ReadMappingValues
-
-```go
-func ReadMappingValues(remainder []byte, map_length Integer) (values *MappingValues, remainder_bytes []byte, errs []error)
-```
-ReadMappingValues returns *MappingValues from a []byte. The remaining bytes
-after the specified length are also returned. Returns a list of errors that
-occurred during parsing.
-
-#### func (MappingValues) Get
-
-```go
-func (m MappingValues) Get(key I2PString) I2PString
-```

lib/common/data/errors.go

@@ -1,19 +0,0 @@
-package data
-
-import "fmt"
-
-// WrapErrors compiles a slice of errors and returns them wrapped together as a single error.
-func WrapErrors(errs []error) error {
-	var err error
-	for i, e := range errs {
-		err = fmt.Errorf("%v\n\t%d: %v", err, i, e)
-	}
-	return err
-}
-
-// PrintErrors prints a formatted list of errors to the console.
-func PrintErrors(errs []error) {
-	for i, e := range errs {
-		fmt.Printf("\t%d: %v\n", i, e)
-	}
-}

lib/common/data/hash.go

@@ -1,47 +0,0 @@
-package data
-
-import (
-	"crypto/sha256"
-	"io"
-)
-
-/*
-[I2P Hash]
-Accurate for version 0.9.49
-
-Description
-Represents the SHA256 of some data.
-
-Contents
-32 bytes
-
-[I2P Hash]:
-*/
-
-// Hash is the represenation of an I2P Hash.
-//
-// https://geti2p.net/spec/common-structures#hash
-type Hash [32]byte
-
-func (h Hash) Bytes() [32]byte {
-	return h
-}
-
-// HashData returns the SHA256 sum of a []byte input as Hash.
-func HashData(data []byte) (h Hash) {
-	// log.Println("Hashing Data:", data)
-	h = sha256.Sum256(data)
-	return
-}
-
-// HashReader returns the SHA256 sum from all data read from an io.Reader.
-// return error if one occurs while reading from reader
-func HashReader(r io.Reader) (h Hash, err error) {
-	sha := sha256.New()
-	_, err = io.Copy(sha, r)
-	if err == nil {
-		d := sha.Sum(nil)
-		copy(h[:], d)
-	}
-	return
-}

lib/common/data/integer.go

@@ -1,85 +0,0 @@
-package data
-
-import (
-	"encoding/binary"
-)
-
-// MAX_INTEGER_SIZE is the maximum length of an I2P integer in bytes.
-const MAX_INTEGER_SIZE = 8
-
-/*
-[I2P Hash]
-Accurate for version 0.9.49
-
-Description
-Represents a non-negative integer.
-
-Contents
-1 to 8 bytes in network byte order (big endian) representing an unsigned integer.
-*/
-
-// Integer is the represenation of an I2P Integer.
-//
-// https://geti2p.net/spec/common-structures#integer
-type Integer []byte
-
-// Bytes returns the raw []byte content of an Integer.
-func (i Integer) Bytes() []byte {
-	return i[:]
-}
-
-// Int returns the Date as a Go integer
-func (i Integer) Int() int {
-	return intFromBytes(i.Bytes())
-}
-
-// ReadInteger returns an Integer from a []byte of specified length.
-// The remaining bytes after the specified length are also returned.
-func ReadInteger(bytes []byte, size int) (Integer, []byte) {
-	if len(bytes) < size {
-		return bytes[:size], bytes[len(bytes):]
-	}
-	return bytes[:size], bytes[size:]
-}
-
-// NewInteger creates a new Integer from []byte using ReadInteger.
-// Limits the length of the created Integer to MAX_INTEGER_SIZE.
-// Returns a pointer to Integer unlike ReadInteger.
-func NewInteger(bytes []byte, size int) (integer *Integer, remainder []byte, err error) {
-	integerSize := MAX_INTEGER_SIZE
-	if size < MAX_INTEGER_SIZE {
-		integerSize = size
-	}
-	intBytes := bytes[:integerSize]
-	remainder = bytes[integerSize:]
-	i, _ := ReadInteger(intBytes, integerSize)
-	integer = &i
-	return
-}
-
-// NewIntegerFromInt creates a new Integer from a Go integer of a specified []byte length.
-func NewIntegerFromInt(value int, size int) (integer *Integer, err error) {
-	bytes := make([]byte, MAX_INTEGER_SIZE)
-	binary.BigEndian.PutUint64(bytes, uint64(value))
-	integerSize := MAX_INTEGER_SIZE
-	if size < MAX_INTEGER_SIZE {
-		integerSize = size
-	}
-	objinteger, _, err := NewInteger(bytes[MAX_INTEGER_SIZE-integerSize:], integerSize)
-	integer = objinteger
-	return
-}
-
-// Interpret a slice of bytes from length 0 to length 8 as a big-endian
-// integer and return an int representation.
-func intFromBytes(number []byte) (value int) {
-	num_len := len(number)
-	if num_len < MAX_INTEGER_SIZE {
-		number = append(
-			make([]byte, MAX_INTEGER_SIZE-num_len),
-			number...,
-		)
-	}
-	value = int(binary.BigEndian.Uint64(number))
-	return
-}

lib/common/data/integer_test.go

@@ -1,32 +0,0 @@
-package data
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestIntegerBigEndian(t *testing.T) {
-	assert := assert.New(t)
-
-	bytes := []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}
-	integer := Integer(bytes)
-
-	assert.Equal(integer.Int(), 1, "Integer() did not parse bytes big endian")
-}
-
-func TestWorksWithOneByte(t *testing.T) {
-	assert := assert.New(t)
-
-	integer := Integer([]byte{0x01})
-
-	assert.Equal(integer.Int(), 1, "Integer() did not correctly parse single byte slice")
-}
-
-func TestIsZeroWithNoData(t *testing.T) {
-	assert := assert.New(t)
-
-	integer := Integer([]byte{})
-
-	assert.Equal(integer.Int(), 0, "Integer() did not correctly parse zero length byte slice")
-}

lib/common/data/mapping.go

@@ -1,180 +0,0 @@
-package data
-
-import (
-	"errors"
-
-	log "github.com/sirupsen/logrus"
-)
-
-/*
-[I2P Mapping]
-Accurate for version 0.9.49
-
-Description
-A set of key/value mappings or properties
-
-
-Contents
-A 2-byte size Integer followed by a series of String=String; pairs
-
-+----+----+----+----+----+----+----+----+
-|  size   |key_string (len + data) | =  |
-+----+----+----+----+----+----+----+----+
-| val_string (len + data)     | ;  | ...
-+----+----+----+----+----+----+----+
-size :: Integer
-        length -> 2 bytes
-        Total number of bytes that follow
-
-key_string :: String
-              A string (one byte length followed by UTF-8 encoded characters)
-
-= :: A single byte containing '='
-
-val_string :: String
-              A string (one byte length followed by UTF-8 encoded characters)
-
-; :: A single byte containing ';'
-*/
-
-// Mapping is the represenation of an I2P Mapping.
-//
-// https://geti2p.net/spec/common-structures#mapping
-type Mapping struct {
-	size *Integer
-	vals *MappingValues
-}
-
-// Values returns the values contained in a Mapping as MappingValues.
-func (mapping Mapping) Values() MappingValues {
-	if mapping.vals == nil {
-		return MappingValues{}
-	}
-	return *mapping.vals
-}
-
-// Data returns a Mapping in its []byte form.
-func (mapping *Mapping) Data() []byte {
-	keyOrValIntegerLength := 1
-	bytes := mapping.size.Bytes()
-	for _, pair := range mapping.Values() {
-		klen, _ := pair[0].Length()
-		keylen, _ := NewIntegerFromInt(klen, keyOrValIntegerLength)
-		bytes = append(bytes, keylen.Bytes()...)
-		bytes = append(bytes, pair[0][1:]...)
-		bytes = append(bytes, 0x3d)
-		vlen, _ := pair[1].Length()
-		vallen, _ := NewIntegerFromInt(vlen, keyOrValIntegerLength)
-		bytes = append(bytes, vallen.Bytes()...)
-		bytes = append(bytes, pair[1][1:]...)
-		bytes = append(bytes, 0x3b)
-	}
-	return bytes
-}
-
-// HasDuplicateKeys returns true if two keys in a mapping are identical.
-func (mapping *Mapping) HasDuplicateKeys() bool {
-	seen_values := make(map[string]bool)
-	values := mapping.Values()
-	for _, pair := range values {
-		key, _ := pair[0].Data()
-		if _, present := seen_values[key]; present {
-			return true
-		} else {
-			seen_values[key] = true
-		}
-	}
-	return false
-}
-
-// GoMapToMapping converts a Go map of unformatted strings to *Mapping.
-func GoMapToMapping(gomap map[string]string) (mapping *Mapping, err error) {
-	map_vals := MappingValues{}
-	for k, v := range gomap {
-		key_str, kerr := ToI2PString(k)
-		if kerr != nil {
-			err = kerr
-			return
-		}
-		val_str, verr := ToI2PString(v)
-		if verr != nil {
-			err = verr
-			return
-		}
-		map_vals = append(
-			map_vals,
-			[2]I2PString{key_str, val_str},
-		)
-	}
-	mapping = ValuesToMapping(map_vals)
-	return
-}
-
-// Check if the string parsing error indicates that the Mapping
-// should no longer be parsed.
-func stopValueRead(err error) bool {
-	return err.Error() == "error parsing string: zero length"
-}
-
-// Determine if the first byte in a slice of bytes is the provided byte.
-func beginsWith(bytes []byte, chr byte) bool {
-	return len(bytes) != 0 &&
-		bytes[0] == chr
-}
-
-// ReadMapping returns Mapping from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadMapping(bytes []byte) (mapping Mapping, remainder []byte, err []error) {
-	if len(bytes) < 3 {
-		log.WithFields(log.Fields{
-			"at":     "ReadMapping",
-			"reason": "zero length",
-		}).Warn("mapping format violation")
-		e := errors.New("zero length")
-		err = append(err, e)
-		return
-	}
-	size, remainder, e := NewInteger(bytes, 2)
-	if e != nil {
-		err = append(err, e)
-	}
-	if size.Int() == 0 {
-		return
-	}
-	mapping.size = size
-	map_bytes := remainder[:mapping.size.Int()]
-	remainder = remainder[mapping.size.Int():]
-	if len(remainder) == 0 {
-		log.WithFields(log.Fields{
-			"at":     "ReadMapping",
-			"reason": "zero length",
-		}).Warn("mapping format violation")
-		e := errors.New("zero length")
-		err = append(err, e)
-	}
-	// TODO: this should take the remainder and the length we already parsed above, as a parameter.
-	// Like tomorrow morning.
-	// ReadMappingValues should not attempt to figure out the length of the bytes it's reading over.
-	vals, _, mappingValueErrs := ReadMappingValues(map_bytes, *mapping.size)
-
-	err = append(err, mappingValueErrs...)
-	mapping.vals = vals
-	if len(mappingValueErrs) > 0 {
-		log.WithFields(log.Fields{
-			"at":     "ReadMapping",
-			"reason": "error parsing mapping values",
-		}).Warn("mapping format violation")
-		e := errors.New("error parsing mapping values")
-		err = append(err, e)
-	}
-	return
-}
-
-// NewMapping creates a new *Mapping from []byte using ReadMapping.
-// Returns a pointer to Mapping unlike ReadMapping.
-func NewMapping(bytes []byte) (values *Mapping, remainder []byte, err []error) {
-	objvalues, remainder, err := ReadMapping(bytes)
-	values = &objvalues
-	return
-}

lib/common/data/mapping_test.go

@@ -1,192 +0,0 @@
-package data
-
-import (
-	"bytes"
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestValuesExclusesPairWithBadData(t *testing.T) {
-	assert := assert.New(t)
-
-	bad_key, _, errs := NewMapping([]byte{0x00, 0x0c, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b, 0x00})
-	values := bad_key.Values()
-
-	e := WrapErrors(errs)
-	t.Log(e)
-
-	assert.NotNil(errs, "Values() did not return errors when some values had bad key")
-
-	if assert.Equal(1, len(values), "Values() did not return valid values when some values had bad key") {
-		k := values[0][0]
-		key, _ := k.Data()
-		v := values[0][1]
-		val, _ := v.Data()
-		assert.Equal(key, "a", "Values() returned by data with invalid key contains incorrect present key")
-		assert.Equal(val, "b", "Values() returned by data with invalid key contains incorrect present key")
-	}
-}
-
-func TestValuesWarnsMissingData(t *testing.T) {
-	assert := assert.New(t)
-
-	_, _, errs := NewMapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62})
-
-	if assert.Equal(2, len(errs), "Values() reported wrong error count when mapping had missing data") {
-		assert.Equal(errs[0].Error(), "warning parsing mapping: mapping length exceeds provided data")
-	}
-}
-
-func TestValuesWarnsExtraData(t *testing.T) {
-	assert := assert.New(t)
-
-	mapping, _, errs := NewMapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b, 0x00})
-	values := mapping.Values()
-
-	key, kerr := values[0][0].Data()
-	val, verr := values[0][1].Data()
-
-	assert.Nil(kerr)
-	assert.Nil(verr)
-	assert.Equal(key, "a", "Values() did not return key in valid data")
-	assert.Equal(val, "b", "Values() did not return value in valid data")
-
-	if assert.Equal(2, len(errs), "Values() reported wrong error count when mapping had extra data") {
-		assert.Equal("warning parsing mapping: data exists beyond length of mapping", errs[0].Error(), "correct error message should be returned")
-	}
-}
-
-func TestValuesEnforcesEqualDelimitor(t *testing.T) {
-	assert := assert.New(t)
-
-	mapping, _, errs := NewMapping([]byte{0x00, 0x06, 0x01, 0x61, 0x30, 0x01, 0x62, 0x3b})
-	values := mapping.Values()
-
-	if assert.Equal(2, len(errs), "Values() reported wrong error count when mapping had = format error") {
-		assert.Equal("mapping format violation, expected =", errs[0].Error(), "correct error message should be returned")
-	}
-	assert.Equal(0, len(values), "Values() not empty with invalid data due to = format error")
-}
-
-func TestValuesEnforcedSemicolonDelimitor(t *testing.T) {
-	assert := assert.New(t)
-
-	mapping, _, errs := NewMapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x30})
-	values := mapping.Values()
-
-	if assert.Equal(2, len(errs), "Values() reported wrong error count when mapping had ; format error") {
-		assert.Equal("mapping format violation, expected ;", errs[0].Error(), "correct error message should be returned")
-	}
-	assert.Equal(0, len(values), "Values() not empty with invalid data due to ; format error")
-}
-
-func TestValuesReturnsValues(t *testing.T) {
-	assert := assert.New(t)
-
-	mapping, _, errs := NewMapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b})
-	values := mapping.Values()
-
-	key, kerr := values[0][0].Data()
-	val, verr := values[0][1].Data()
-
-	assert.Nil(errs, "Values() returned a errors with parsing valid data")
-	assert.Nil(kerr)
-	assert.Nil(verr)
-	assert.Equal("a", key, "Values() did not return key in valid data")
-	assert.Equal("b", val, "Values() did not return value in valid data")
-}
-
-func TestHasDuplicateKeysTrueWhenDuplicates(t *testing.T) {
-	assert := assert.New(t)
-
-	dups, _, _ := NewMapping([]byte{0x00, 0x0c, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b})
-
-	assert.Equal(true, dups.HasDuplicateKeys(), "HasDuplicateKeys() did not report true when duplicate keys present")
-}
-
-func TestHasDuplicateKeysFalseWithoutDuplicates(t *testing.T) {
-	assert := assert.New(t)
-
-	mapping, _, _ := NewMapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b})
-
-	assert.Equal(false, mapping.HasDuplicateKeys(), "HasDuplicateKeys() did not report false when no duplicate keys present")
-}
-
-func TestReadMappingHasDuplicateKeys(t *testing.T) {
-	assert := assert.New(t)
-
-	_, _, errs := NewMapping([]byte{0x00, 0x0c, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b})
-
-	assert.Equal("mapping format violation, duplicate key in mapping", errs[0].Error(), "ReadMapping should throw an error when duplicate keys are present.")
-}
-
-func TestGoMapToMappingProducesCorrectMapping(t *testing.T) {
-	assert := assert.New(t)
-
-	gomap := map[string]string{"a": "b"}
-	mapping, err := GoMapToMapping(gomap)
-
-	assert.Nil(err, "GoMapToMapping() returned error with valid data")
-	expected := []byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b}
-	if bytes.Compare(mapping.Data(), expected) != 0 {
-		t.Fatal("GoMapToMapping did not produce correct Mapping", mapping, expected)
-	}
-}
-
-func TestFullGoMapToMappingProducesCorrectMapping(t *testing.T) {
-	assert := assert.New(t)
-
-	gomap := map[string]string{
-		"a": "b",
-		"c": "d",
-	}
-	mapping, err := GoMapToMapping(gomap)
-
-	assert.Nil(err, "GoMapToMapping() returned error with valid data")
-	expected := []byte{0x00, 0x0c, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b, 0x01, 0x63, 0x3d, 0x01, 0x64, 0x3b}
-	if bytes.Compare(mapping.Data(), expected) != 0 {
-		t.Fatal("GoMapToMapping did not produce correct Mapping", mapping, expected)
-	}
-}
-
-func TestStopValueReadTrueWhenCorrectErr(t *testing.T) {
-	assert := assert.New(t)
-
-	status := stopValueRead(errors.New("error parsing string: zero length"))
-
-	assert.Equal(true, status, "stopValueRead() did not return true when String error found")
-}
-
-func TestStopValueReadFalseWhenWrongErr(t *testing.T) {
-	assert := assert.New(t)
-
-	status := stopValueRead(errors.New("something else"))
-
-	assert.Equal(false, status, "stopValueRead() did not return false when non String error found")
-}
-
-func TestBeginsWithCorrectWhenTrue(t *testing.T) {
-	assert := assert.New(t)
-
-	slice := []byte{0x41}
-
-	assert.Equal(true, beginsWith(slice, 0x41), "beginsWith() did not return true when correct")
-}
-
-func TestBeginsWithCorrectWhenFalse(t *testing.T) {
-	assert := assert.New(t)
-
-	slice := []byte{0x00}
-
-	assert.Equal(false, beginsWith(slice, 0x41), "beginsWith() did not false when incorrect")
-}
-
-func TestBeginsWithCorrectWhenNil(t *testing.T) {
-	assert := assert.New(t)
-
-	slice := make([]byte, 0)
-
-	assert.Equal(false, beginsWith(slice, 0x41), "beginsWith() did not return false on empty slice")
-}

lib/common/data/mapping_values.go

@@ -1,193 +0,0 @@
-package data
-
-import (
-	"errors"
-	"sort"
-
-	log "github.com/sirupsen/logrus"
-)
-
-// MappingValues represents the parsed key value pairs inside of an I2P Mapping.
-type MappingValues [][2]I2PString
-
-func (m MappingValues) Get(key I2PString) I2PString {
-	keyBytes, _ := key.Data()
-	for _, pair := range m {
-		kb, _ := pair[0][0:].Data()
-		if kb == keyBytes {
-			return pair[1][1:]
-		}
-	}
-	return nil
-}
-
-// ValuesToMapping creates a *Mapping using MappingValues.
-// The values are sorted in the order defined in mappingOrder.
-func ValuesToMapping(values MappingValues) *Mapping {
-	// Default length to 2 * len
-	// 1 byte for ;
-	// 1 byte for =
-	baseLength := 2 * len(values)
-	for _, mappingVals := range values {
-		for _, keyOrVal := range mappingVals {
-			baseLength += len(keyOrVal)
-		}
-	}
-
-	mappingSize, _ := NewIntegerFromInt(baseLength, 2)
-	return &Mapping{
-		size: mappingSize,
-		vals: &values,
-	}
-}
-
-// I2P Mappings require consistent order in some cases for cryptographic signing, and sorting
-// by keys. The Mapping is sorted lexographically by keys. Duplicate keys are allowed in general,
-// but in implementations where they must be sorted like I2CP SessionConfig duplicate keys are not allowed.
-// In practice routers do not seem to allow duplicate keys.
-func mappingOrder(values MappingValues) {
-	sort.SliceStable(values, func(i, j int) bool {
-		// Lexographic sort on keys only
-		data1, _ := values[i][0].Data()
-		data2, _ := values[j][0].Data()
-		return data1 < data2
-	})
-}
-
-// ReadMappingValues returns *MappingValues from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadMappingValues(remainder []byte, map_length Integer) (values *MappingValues, remainder_bytes []byte, errs []error) {
-	// mapping := remainder
-	// var remainder = mapping
-	// var err error
-	if remainder == nil || len(remainder) < 1 {
-		log.WithFields(log.Fields{
-			"at":     "(Mapping) Values",
-			"reason": "data shorter than expected",
-		}).Error("mapping contained no data")
-		errs = []error{errors.New("mapping contained no data")}
-		return
-	}
-	map_values := make(MappingValues, 0)
-	int_map_length := map_length.Int()
-	mapping_len := len(remainder)
-	if mapping_len > int_map_length {
-		log.WithFields(log.Fields{
-			"at":                   "(Mapping) Values",
-			"mapping_bytes_length": mapping_len,
-			"mapping_length_field": int_map_length,
-			"reason":               "data longer than expected",
-		}).Warn("mapping format warning")
-		errs = append(errs, errors.New("warning parsing mapping: data exists beyond length of mapping"))
-	} else if int_map_length > mapping_len {
-		log.WithFields(log.Fields{
-			"at":                   "(Mapping) Values",
-			"mapping_bytes_length": mapping_len,
-			"mapping_length_field": int_map_length,
-			"reason":               "data shorter than expected",
-		}).Warn("mapping format warning")
-		errs = append(errs, errors.New("warning parsing mapping: mapping length exceeds provided data"))
-	}
-
-	encounteredKeysMap := map[string]bool{}
-	// pop off length bytes before parsing kv pairs
-	// remainder = remainder[2:]
-
-	for {
-		// Read a key, breaking on fatal errors
-		// and appending warnings
-
-		// Minimum byte length required for another KV pair.
-		// Two bytes for each string length
-		// At least 1 byte per string
-		// One byte for =
-		// One byte for ;
-		if len(remainder) < 6 {
-			// Not returning an error here as the issue is already flagged by mapping length being wrong.
-			log.WithFields(log.Fields{
-				"at":     "(Mapping) Values",
-				"reason": "mapping format violation",
-			}).Warn("mapping format violation, too few bytes for a kv pair")
-			break
-		}
-
-		key_str, more, err := ReadI2PString(remainder)
-		if err != nil {
-			if stopValueRead(err) {
-				errs = append(errs, err)
-				// return
-			}
-		}
-		// overwriting remainder with more as another var to prevent memory weirdness in loops
-		remainder = more
-		// log.Printf("(MAPPING VALUES DEBUG) Remainder: %s\n", remainder)
-
-		// Check if key has already been encountered in this mapping
-		keyBytes, _ := key_str.Data()
-		keyAsString := string(keyBytes)
-		_, ok := encounteredKeysMap[keyAsString]
-		if ok {
-			log.WithFields(log.Fields{
-				"at":     "(Mapping) Values",
-				"reason": "duplicate key in mapping",
-				"key":    string(key_str),
-			}).Error("mapping format violation")
-			log.Printf("DUPE: %s", key_str)
-			errs = append(errs, errors.New("mapping format violation, duplicate key in mapping"))
-			// Based on other implementations this does not seem to happen often?
-			// Java throws an exception in this case, the base object is a Hashmap so the value is overwritten and an exception is thrown.
-			// i2pd  as far as I can tell just overwrites the original value
-			// Continue on, we can check if the Mapping contains duplicate keys later.
-		}
-
-		if !beginsWith(remainder, 0x3d) {
-			log.WithFields(log.Fields{
-				"at":     "(Mapping) Values",
-				"reason": "expected =",
-				"value:": string(remainder),
-			}).Warn("mapping format violation")
-			errs = append(errs, errors.New("mapping format violation, expected ="))
-			log.Printf("ERRVAL: %s", remainder)
-			break
-		} else {
-			remainder = remainder[1:]
-		}
-
-		// Read a value, breaking on fatal errors
-		// and appending warnings
-		val_str, more, err := ReadI2PString(remainder)
-		if err != nil {
-			if stopValueRead(err) {
-				errs = append(errs, err)
-				// return
-			}
-		}
-		// overwriting remainder with more as another var to prevent memory weirdness in loops
-		remainder = more
-		// log.Printf("(MAPPING VALUES DEBUG) Remainder: %s\n", remainder)
-		// log.Printf("(MAPPING VALUES DEBUG) String: value: %s", val_str)
-		if !beginsWith(remainder, 0x3b) {
-			log.WithFields(log.Fields{
-				"at":     "(Mapping) Values",
-				"reason": "expected ;",
-				"value:": string(remainder),
-			}).Warn("mapping format violation")
-			errs = append(errs, errors.New("mapping format violation, expected ;"))
-			break
-		} else {
-			remainder = remainder[1:]
-		}
-
-		// Append the key-value pair and break if there is no more data to read
-		map_values = append(map_values, [2]I2PString{key_str, val_str})
-		if len(remainder) == 0 {
-			break
-		}
-
-		// Store the encountered key with arbitrary data
-		encounteredKeysMap[keyAsString] = true
-	}
-	values = &map_values
-	return
-}

lib/common/data/mapping_values_test.go

@@ -1,47 +0,0 @@
-package data
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestMappingOrderSortsValuesThenKeys(t *testing.T) {
-	a, _ := ToI2PString("a")
-	b, _ := ToI2PString("b")
-	aa, _ := ToI2PString("aa")
-	ab, _ := ToI2PString("ab")
-	ac, _ := ToI2PString("ac")
-	values := MappingValues{
-		[2]I2PString{b, b},
-		[2]I2PString{ac, a},
-		[2]I2PString{ab, b},
-		[2]I2PString{aa, a},
-		[2]I2PString{a, a},
-	}
-	mappingOrder(values)
-	for i, pair := range values {
-		key, _ := pair[0].Data()
-		switch i {
-		case 0:
-			if !(key == "a") {
-				t.Fatal(fmt.Sprintf("mappingOrder expected key a, got %s at index", key), i)
-			}
-		case 1:
-			if !(key == "aa") {
-				t.Fatal(fmt.Sprintf("mappingOrder expected key aa, got %s at index", key), i)
-			}
-		case 2:
-			if !(key == "ab") {
-				t.Fatal(fmt.Sprintf("mappingOrder expected key ab, got %s at index", key), i)
-			}
-		case 3:
-			if !(key == "ac") {
-				t.Fatal(fmt.Sprintf("mappingOrder expected key ac, got %s at index", key), i)
-			}
-		case 4:
-			if !(key == "b") {
-				t.Fatal(fmt.Sprintf("mappingOrder expected key b, got %s at index", key), i)
-			}
-		}
-	}
-}

lib/common/data/string.go

@@ -1,137 +0,0 @@
-package data
-
-import (
-	"errors"
-	"fmt"
-
-	log "github.com/sirupsen/logrus"
-)
-
-// STRING_MAX_SIZE is the maximum number of bytes that can be stored in an I2P string
-const STRING_MAX_SIZE = 255
-
-/*
-[I2P String]
-Accurate for version 0.9.49
-
-Description
-Represents a UTF-8 encoded string.
-
-Contents
-1 or more bytes where the first byte is the number of bytes (not characters!) in the string
-and the remaining 0-255 bytes are the non-null terminated UTF-8 encoded character array.
-Length limit is 255 bytes (not characters). Length may be 0.
-*/
-
-// I2PString is the represenation of an I2P String.
-//
-// https://geti2p.net/spec/common-structures#string
-type I2PString []byte
-
-// Length returns the length specified in the first byte.
-// Returns error if the specified does not match the actual length or the string is otherwise invalid.
-func (str I2PString) Length() (length int, err error) {
-	if len(str) == 0 {
-		log.WithFields(log.Fields{
-			"at":     "(I2PString) Length",
-			"reason": "no data",
-		}).Error("error parsing string")
-		err = errors.New("error parsing string: zero length")
-		return
-	}
-	l, _, err := NewInteger(str[:], 1)
-	if err != nil {
-		return l.Int(), err
-	}
-	length = l.Int()
-	str_len := len(str)
-	if length > str_len {
-		/*log.WithFields(log.Fields{
-			"at":                  "(I2PString) Length",
-			"string_bytes_length": str_len,
-			"string_length_field": length,
-			"data":                string(str),
-			"reason":              "data less than specified by length",
-		}).Error("string format warning")*/
-		err = errors.New("string parsing warning: string data is shorter than specified by length")
-	}
-	return
-}
-
-// Data returns the I2PString content as a string trimmed to the specified length and not including the length byte.
-// Returns error encountered by Length.
-func (str I2PString) Data() (data string, err error) {
-	length, err := str.Length()
-	if err != nil {
-		switch err.Error() {
-		case "error parsing string: zero length":
-			return
-		case "string parsing warning: string data is shorter than specified by length":
-			if is, e := ToI2PString(string(str[:])); e != nil {
-				return "", e
-			} else {
-				return is.Data()
-			}
-		case "string parsing warning: string contains data beyond length":
-			data = string(str[1:])
-			return
-		}
-	}
-	if length == 0 {
-		return
-	}
-	data = string(str[1 : length+1])
-	return
-}
-
-// ToI2PString converts a Go string to an I2PString.
-// Returns error if the string exceeds STRING_MAX_SIZE.
-func ToI2PString(data string) (str I2PString, err error) {
-	data_len := len(data)
-	if data_len > STRING_MAX_SIZE {
-		log.WithFields(log.Fields{
-			"at":         "ToI2PI2PString",
-			"string_len": data_len,
-			"max_len":    STRING_MAX_SIZE,
-			"reason":     "too much data",
-		}).Error("cannot create I2P string")
-		err = errors.New("cannot store that much data in I2P string")
-		return
-	}
-	i2p_string := []byte{byte(data_len)}
-	i2p_string = append(i2p_string, []byte(data)...)
-	str = I2PString(i2p_string)
-	return
-}
-
-//
-// Read a string from a slice of bytes, returning any extra data on the end
-// of the slice and any errors encountered parsing the I2PString.
-//
-
-// ReadI2PString returns I2PString from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadI2PString(data []byte) (str I2PString, remainder []byte, err error) {
-	length, _, err := NewInteger(data, 1)
-	if err != nil {
-		return
-	}
-	data_len := length.Int() + 1
-	str = data[:data_len]
-	remainder = data[data_len:]
-	l, err := str.Length()
-	if l != data_len-1 {
-		err = fmt.Errorf("error reading I2P string, length does not match data")
-		return
-	}
-	return
-}
-
-// NewI2PString creates a new *I2PString from []byte using ReadI2PString.
-// Returns a pointer to I2PString unlike ReadI2PString.
-/*func NewI2PString(data []byte) (str *I2PString, remainder []byte, err error) {
-	objstr, remainder, err := ReadI2PString(data)
-	str = &objstr
-	return
-}*/

lib/common/date.go

@@ -0,0 +1,45 @@
+package common
+
+/*
+I2P Date
+https://geti2p.net/spec/common-structures#date
+Accurate for version 0.9.24
+*/
+
+import (
+	"errors"
+	log "github.com/sirupsen/logrus"
+	"time"
+)
+
+type Date [8]byte
+
+const DATE_SIZE = 8
+
+//
+// Time takes the value stored in date as an 8 byte big-endian integer representing the
+// number of milliseconds since the beginning of unix time and converts it to a Go time.Time
+// struct.
+//
+func (date Date) Time() (date_time time.Time) {
+	seconds, _ := NewInteger(date[:])
+	date_time = time.Unix(0, int64(seconds.Value()*1000000))
+	return
+}
+
+func ReadDate(data []byte) (h Date, remainder []byte, err error) {
+	if len(data) < DATE_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "(Date) ReadDate",
+			"data_len":     len(data),
+			"required_len": "8",
+			"reason":       "date missing data",
+		}).Error("date error")
+		err = errors.New("error reading date, insufficient length")
+		copy(h[:], data[0:len(data)-1])
+	} else {
+		copy(h[:], data[0:DATE_SIZE-1])
+		copy(remainder, data[DATE_SIZE-1:])
+	}
+	return
+}

lib/common/date_test.go

@@ -1,9 +1,8 @@
-package data
+package common
 
 import (
-	"testing"
-
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestTimeFromMiliseconds(t *testing.T) {

lib/common/destination.go

@@ -0,0 +1,62 @@
+package common
+
+/*
+I2P Destination
+https://geti2p.net/spec/common-structures#destination
+Accurate for version 0.9.24
+
+Identical to KeysAndCert
+*/
+
+import (
+	"github.com/go-i2p/go-i2p/lib/common/base32"
+	"github.com/go-i2p/go-i2p/lib/common/base64"
+	"github.com/go-i2p/go-i2p/lib/crypto"
+	"strings"
+)
+
+//
+// A Destination is a KeysAndCert with functionallity
+// for generating base32 and base64 addresses.
+//
+type Destination struct {
+	KeysAndCert
+}
+
+func (destination Destination) PublicKey() (crypto.PublicKey, error) {
+	return destination.KeysAndCert.GetPublicKey()
+}
+
+func (destination Destination) SigningPublicKey() (crypto.SigningPublicKey, error) {
+	return destination.KeysAndCert.GetSigningPublicKey()
+}
+
+func (destination Destination) Certificate() (CertificateInterface, error) {
+	return destination.KeysAndCert.GetCertificate()
+}
+
+//
+// Generate the I2P base32 address for this Destination.
+//
+func (destination Destination) Base32Address() (str string) {
+	hash := crypto.SHA256(destination.Cert())
+	str = strings.Trim(base32.EncodeToString(hash[:]), "=")
+	str = str + ".b32.i2p"
+	return
+}
+
+//
+// Generate the I2P base64 address for this Destination.
+//
+func (destination Destination) Base64() string {
+	return base64.EncodeToString(destination.Cert())
+}
+
+func ReadDestination(data []byte) (destination Destination, remainder []byte, err error) {
+	keys_and_cert, remainder, err := ReadKeysAndCert(data)
+	if err != nil {
+		return
+	}
+	destination.KeysAndCert = keys_and_cert
+	return
+}

lib/common/destination/destination.go

@@ -1,56 +0,0 @@
-// Package destination implements the I2P Destination common data structure
-package destination
-
-import (
-	"strings"
-
-	. "github.com/go-i2p/go-i2p/lib/common/keys_and_cert"
-
-	"github.com/go-i2p/go-i2p/lib/common/base32"
-	"github.com/go-i2p/go-i2p/lib/common/base64"
-	"github.com/go-i2p/go-i2p/lib/crypto"
-)
-
-/*
-[Destination]
-Accurate for version 0.9.49
-
-Description
-A Destination defines a particular endpoint to which messages can be directed for secure delivery.
-
-Contents
-Identical to KeysAndCert.
-*/
-
-// Destination is the represenation of an I2P Destination.
-//
-// https://geti2p.net/spec/common-structures#destination
-type Destination struct {
-	KeysAndCert
-}
-
-// Base32Address returns the I2P base32 address for this Destination.
-func (destination Destination) Base32Address() (str string) {
-	dest := destination.KeysAndCert.KeyCertificate.Bytes()
-	hash := crypto.SHA256(dest)
-	str = strings.Trim(base32.EncodeToString(hash[:]), "=")
-	str = str + ".b32.i2p"
-	return
-}
-
-// Base64 returns the I2P base64 address for this Destination.
-func (destination Destination) Base64() string {
-	dest := destination.KeysAndCert.KeyCertificate.Bytes()
-	return base64.EncodeToString(dest)
-}
-
-// ReadDestination returns Destination from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadDestination(data []byte) (destination Destination, remainder []byte, err error) {
-	keys_and_cert, remainder, err := ReadKeysAndCert(data)
-	destination = Destination{
-		keys_and_cert,
-	}
-	return
-}

lib/common/destination/doc.md

@@ -1,42 +0,0 @@
-# destination
---
-    import "github.com/go-i2p/go-i2p/lib/common/destination"
-
-Package destination implements the I2P Destination common data structure
-
-## Usage
-
-#### type Destination
-
-```go
-type Destination struct {
-	KeysAndCert
-}
-```
-
-Destination is the represenation of an I2P Destination.
-
-https://geti2p.net/spec/common-structures#destination
-
-#### func  ReadDestination
-
-```go
-func ReadDestination(data []byte) (destination Destination, remainder []byte, err error)
-```
-ReadDestination returns Destination from a []byte. The remaining bytes after the
-specified length are also returned. Returns a list of errors that occurred
-during parsing.
-
-#### func (Destination) Base32Address
-
-```go
-func (destination Destination) Base32Address() (str string)
-```
-Base32Address returns the I2P base32 address for this Destination.
-
-#### func (Destination) Base64
-
-```go
-func (destination Destination) Base64() string
-```
-Base64 returns the I2P base64 address for this Destination.

lib/common/fuzz/Dockerfile

@@ -1,7 +1,8 @@
 FROM golang
 
 RUN apt-get update && \
-    apt-get upgrade -y
+    apt-get upgrade -y && \
+    apt-get install libsodium-dev -y
 
 RUN go get github.com/dvyukov/go-fuzz/go-fuzz
 RUN go get github.com/dvyukov/go-fuzz/go-fuzz-build

lib/common/fuzz/certificate/doc.md

@@ -1,12 +0,0 @@
-# exportable
---
-    import "github.com/go-i2p/go-i2p/lib/common/fuzz/certificate"
-
-
-## Usage
-
-#### func  Fuzz
-
-```go
-func Fuzz(data []byte) int
-```

lib/common/fuzz/certificate/fuzz.go

@@ -1,9 +1,9 @@
 package exportable
 
-import common "github.com/go-i2p/go-i2p/lib/common/certificate"
+import "github.com/go-i2p/go-i2p/lib/common"
 
 func Fuzz(data []byte) int {
-	cert, _, _ := common.ReadCertificate(data)
+	cert := common.Certificate(data)
 	cert.Data()
 	cert.Length()
 	cert.Type()

lib/common/fuzz/destination/doc.md

@@ -1,12 +0,0 @@
-# exportable
---
-    import "github.com/go-i2p/go-i2p/lib/common/fuzz/destination"
-
-
-## Usage
-
-#### func  Fuzz
-
-```go
-func Fuzz(data []byte) int
-```

lib/common/fuzz/destination/fuzz.go

@@ -1,9 +1,9 @@
 package exportable
 
-import common "github.com/go-i2p/go-i2p/lib/common/destination"
+import "github.com/go-i2p/go-i2p/lib/common"
 
 func Fuzz(data []byte) int {
-	destination, _, _ := common.ReadDestination(data)
+	destination := common.Destination(data)
 	destination.Base32Address()
 	destination.Base64()
 	return 0

lib/common/fuzz/keys_and_cert/doc.md

@@ -1,12 +0,0 @@
-# exportable
---
-    import "github.com/go-i2p/go-i2p/lib/common/fuzz/keys_and_cert"
-
-
-## Usage
-
-#### func  Fuzz
-
-```go
-func Fuzz(data []byte) int
-```

lib/common/fuzz/keys_and_cert/fuzz.go

@@ -1,6 +1,6 @@
 package exportable
 
-import common "github.com/go-i2p/go-i2p/lib/common/keys_and_cert"
+import "github.com/go-i2p/go-i2p/lib/common"
 
 func Fuzz(data []byte) int {
 	keys_and_cert, _, _ := common.ReadKeysAndCert(data)

lib/common/fuzz/router_address/doc.md

@@ -1,12 +0,0 @@
-# exportable
---
-    import "github.com/go-i2p/go-i2p/lib/common/fuzz/router_address"
-
-
-## Usage
-
-#### func  Fuzz
-
-```go
-func Fuzz(data []byte) int
-```

lib/common/fuzz/router_address/fuzz.go

@@ -1,6 +1,6 @@
 package exportable
 
-import common "github.com/go-i2p/go-i2p/lib/common/router_address"
+import "github.com/go-i2p/go-i2p/lib/common"
 
 func Fuzz(data []byte) int {
 	router_address, _, _ := common.ReadRouterAddress(data)

lib/common/fuzz/router_identity/doc.md

@@ -1,12 +0,0 @@
-# exportable
---
-    import "github.com/go-i2p/go-i2p/lib/common/fuzz/router_identity"
-
-
-## Usage
-
-#### func  Fuzz
-
-```go
-func Fuzz(data []byte) int
-```

lib/common/fuzz/router_identity/fuzz.go

@@ -1,6 +1,6 @@
 package exportable
 
-import common "github.com/go-i2p/go-i2p/lib/common/router_identity"
+import "github.com/go-i2p/go-i2p/lib/common"
 
 func Fuzz(data []byte) int {
 	router_identity, _, _ := common.ReadRouterIdentity(data)

lib/common/fuzz/string/doc.md

@@ -1,12 +0,0 @@
-# exportable
---
-    import "github.com/go-i2p/go-i2p/lib/common/fuzz/string"
-
-
-## Usage
-
-#### func  Fuzz
-
-```go
-func Fuzz(data []byte) int
-```

lib/common/fuzz/string/fuzz.go

@@ -1,9 +1,9 @@
 package exportable
 
-import common "github.com/go-i2p/go-i2p/lib/common/data"
+import "github.com/go-i2p/go-i2p/lib/common"
 
 func Fuzz(data []byte) int {
-	str := common.I2PString(data)
+	str, _, _ := common.ReadString(data)
 	str.Data()
 	str.Length()
 	str, _ = common.ToI2PString(string(data))

lib/common/hash.go

@@ -0,0 +1,48 @@
+package common
+
+import (
+	"crypto/sha256"
+	"errors"
+	log "github.com/sirupsen/logrus"
+	"io"
+)
+
+const HASH_SIZE = 32
+
+// sha256 hash of some data
+type Hash [32]byte
+
+// calculate sha256 of a byte slice
+func HashData(data []byte) (h Hash) {
+	h = sha256.Sum256(data)
+	return
+}
+
+// calulate sha256 of all data being read from an io.Reader
+// return error if one occurs while reading from reader
+func HashReader(r io.Reader) (h Hash, err error) {
+	sha := sha256.New()
+	_, err = io.Copy(sha, r)
+	if err == nil {
+		d := sha.Sum(nil)
+		copy(h[:], d)
+	}
+	return
+}
+
+func ReadHash(data []byte) (h Hash, remainder []byte, err error) {
+	if len(data) < HASH_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "(Hash) ReadHash",
+			"data_len":     len(data),
+			"required_len": "32",
+			"reason":       "hash missing data",
+		}).Error("hash error")
+		err = errors.New("error reading hash, insufficient length")
+		copy(h[:], data[0:len(data)-1])
+	} else {
+		copy(h[:], data[0:HASH_SIZE-1])
+		copy(remainder, data[HASH_SIZE-1:])
+	}
+	return
+}

lib/common/ident.go

@@ -0,0 +1,33 @@
+package common
+
+/*
+I2P Tunnel Identity Helpers
+https://geti2p.net/spec/common-structures#ident
+Accurate for version 0.9.24
+*/
+
+import (
+	"errors"
+	log "github.com/sirupsen/logrus"
+)
+
+type Ident [4]byte
+
+const IDENT_SIZE = 4
+
+func ReadIdent(data []byte) (h Ident, remainder []byte, err error) {
+	if len(data) < IDENT_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "(Ident) ReadIdent",
+			"data_len":     len(data),
+			"required_len": "8",
+			"reason":       "ident missing data",
+		}).Error("ident error")
+		err = errors.New("error reading ident, insufficient length")
+		copy(h[:], data[0:len(data)-1])
+	} else {
+		copy(h[:], data[0:IDENT_SIZE-1])
+		copy(remainder, data[IDENT_SIZE-1:])
+	}
+	return
+}

lib/common/integer.go

@@ -0,0 +1,83 @@
+package common
+
+/*
+I2P Integer
+https://geti2p.net/spec/common-structures#integer
+Accurate for version 0.9.24
+*/
+
+import (
+	"encoding/binary"
+	//	log "github.com/sirupsen/logrus"
+	//	"errors"
+)
+
+// Total byte length of an I2P integer
+const (
+	INTEGER_SIZE = 8
+)
+
+type Integer []byte
+
+func (i *Integer) longBytes() (value [INTEGER_SIZE]byte) {
+	value = [INTEGER_SIZE]byte{0, 0, 0, 0, 0, 0, 0, 0}
+	pad := INTEGER_SIZE - len([]byte(*i))
+	for index, element := range []byte(*i) {
+		value[pad+index] = element
+	}
+	return value
+}
+
+func (i *Integer) Value() int {
+	if i == nil {
+		return 0
+	}
+	r := i.longBytes()
+	//	log.Println("LONG BYTES", r)
+	return int(binary.BigEndian.Uint64(r[:]))
+	//	return int(binary.BigEndian.Int64(r[:]))
+}
+
+func (i *Integer) Bytes() []byte {
+	if i == nil {
+		return []byte{}
+	}
+	if len([]byte(*i)) == 0 {
+		return []byte{0}
+	}
+	r := []byte(*i)
+	return r
+}
+
+//
+// Interpret a slice of bytes from length 0 to length 8 as a big-endian
+// integer and return an int representation.
+//
+func NewInteger(number []byte) (value *Integer, err error) {
+	var integer Integer = number
+	value = &integer //[INTEGER_SIZE]byte(number)
+	//	for index, element := range number {
+	//		value[INTEGER_SIZE-1-index] = element
+	//	}
+	/*length := len(number)
+	if length < INTEGER_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "(Integer) NewInteger",
+			"length":     length,
+			"required_len": INTEGER_SIZE,
+			"reason":       "not enough data",
+		}).Error("error parsing Integer")
+		err = errors.New("error parsing Integer, not enough data")
+	}else if length > INTEGER_SIZE{
+		log.WithFields(log.Fields{
+			"at":           "(Integer) NewInteger",
+			"length":     length,
+			"required_len": INTEGER_SIZE,
+			"reason":       "too much data",
+		}).Error("error parsing Integer")
+		err = errors.New("error parsing Integer, too much data")
+	}else{
+			err = nil
+	}*/
+	return
+}

lib/common/integer_test.go

@@ -0,0 +1,34 @@
+package common
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestIntegerBigEndian(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}
+	integer, err := NewInteger(bytes)
+	assert.Nil(err)
+
+	assert.Equal(integer.Value(), 1, "Integer() did not parse bytes big endian")
+
+	checkbytes := integer.Bytes()
+
+	assert.Equal(bytes, checkbytes, "IntegerBytes() did not match original bytes")
+}
+
+func TestWorksWithOneByte(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x00}
+	integer, err := NewInteger(bytes)
+	assert.Nil(err)
+
+	assert.Equal(integer.Value(), 0, "Integer() did not correctly parse single byte slice")
+
+	checkbytes := integer.Bytes()
+
+	assert.Equal(bytes, checkbytes, "IntegerBytes() did not match original bytes")
+}

lib/common/key_certificate.go

@@ -0,0 +1,303 @@
+package common
+
+/*
+I2P Key Certificate
+https://geti2p.net/spec/common-structures#certificate
+Accurate for version 0.9.24
+
++----+----+----+----+----+-//
+|type| length  | payload
++----+----+----+----+----+-//
+
+type :: Integer
+        length -> 1 byte
+
+        case 0 -> NULL
+        case 1 -> HASHCASH
+        case 2 -> HIDDEN
+        case 3 -> SIGNED
+        case 4 -> MULTIPLE
+        case 5 -> KEY
+
+length :: Integer
+          length -> 2 bytes
+
+payload :: data
+           length -> $length bytes
+*/
+
+import (
+	"errors"
+
+	"github.com/go-i2p/go-i2p/lib/crypto"
+	log "github.com/sirupsen/logrus"
+)
+
+// Key Certificate Signing Key Types
+const (
+	KEYCERT_SIGN_DSA_SHA1 = iota
+	KEYCERT_SIGN_P256
+	KEYCERT_SIGN_P384
+	KEYCERT_SIGN_P521
+	KEYCERT_SIGN_RSA2048
+	KEYCERT_SIGN_RSA3072
+	KEYCERT_SIGN_RSA4096
+	KEYCERT_SIGN_ED25519
+	KEYCERT_SIGN_ED25519PH
+)
+
+// Key Certificate Public Key Types
+const (
+	KEYCERT_CRYPTO_ELG = iota
+	KEYCERT_CRYPTO_P256
+	KEYCERT_CRYPTO_P384
+	KEYCERT_CRYPTO_P521
+	KEYCERT_CRYPTO_X25519
+)
+
+// SigningPublicKey sizes for Signing Key Types
+const (
+	KEYCERT_SIGN_DSA_SHA1_SIZE  = 128
+	KEYCERT_SIGN_P256_SIZE      = 64
+	KEYCERT_SIGN_P384_SIZE      = 96
+	KEYCERT_SIGN_P521_SIZE      = 132
+	KEYCERT_SIGN_RSA2048_SIZE   = 256
+	KEYCERT_SIGN_RSA3072_SIZE   = 384
+	KEYCERT_SIGN_RSA4096_SIZE   = 512
+	KEYCERT_SIGN_ED25519_SIZE   = 32
+	KEYCERT_SIGN_ED25519PH_SIZE = 32
+)
+
+// PublicKey sizes for Public Key Types
+const (
+	KEYCERT_CRYPTO_ELG_SIZE = 256
+)
+
+// Sizes of structures in KeyCertificates
+const (
+	KEYCERT_PUBKEY_SIZE = 256
+	KEYCERT_SPK_SIZE    = 128
+)
+
+const (
+	KEYCERT_MIN_SIZE = 7
+)
+
+type KeyCertificate struct {
+	CertificateInterface
+	PKType   *Integer
+	PKExtra  []byte
+	SPKType  *Integer
+	SPKExtra []byte
+} //[]byte
+
+//
+// The data contained in the Key Certificate.
+//
+func (key_certificate KeyCertificate) Data() ([]byte, error) {
+	var r []byte
+	r = append(r, key_certificate.CertificateInterface.Cert()...)
+	r = append(r, key_certificate.PKType.Bytes()...)
+	r = append(r, key_certificate.SPKType.Bytes()...)
+	return r, nil
+}
+
+//
+// The SigningPublicKey type this Key Certificate describes and any errors encountered
+// parsing the KeyCertificate.
+//
+func (key_certificate KeyCertificate) SigningPublicKeyType() (signing_pubkey_type int, err error) {
+	//	signing_key_type := key_certificate.SPKType
+	//	data_len := len(key_certificate.CertificateInterface.CertBytes)
+	if len(key_certificate.SPKType.Bytes()) < 2 {
+		log.WithFields(log.Fields{
+			"at":           "(KeyCertificate) SigningPublicKeyType",
+			"data_len":     len(key_certificate.SPKType.Bytes()),
+			"required_len": 2,
+			"reason":       "not enough data",
+		}).Error("error retrieving Signing Public Key type")
+		err = errors.New("error retrieving signing public key type: not enough data")
+		return
+	}
+	log.Println("Signing Public Key Type", key_certificate.SPKType) //.Value())
+	return key_certificate.SPKType.Value(), nil
+}
+
+//
+// The PublicKey type this Key Certificate describes and any errors encountered parsing
+// this KeyCertificate.
+//
+func (key_certificate KeyCertificate) PublicKeyType() (pubkey_type int, err error) {
+	if len(key_certificate.PKType.Bytes()) < 2 {
+		log.WithFields(log.Fields{
+			"at":           "(KeyCertificate) SingingPublicKeyType",
+			"data_len":     len(key_certificate.PKType.Bytes()),
+			"required_len": 2,
+			"reason":       "not enough data",
+		}).Error("error retrieving Singning Public Key type")
+		err = errors.New("error retrieving signing public key type: not enough data")
+		return
+	}
+	log.Println("Public Key Type", key_certificate.PKType)
+	return key_certificate.PKType.Value(), nil
+}
+
+//
+// Given some bytes, build a PublicKey using any excess data that may be stored in the KeyCertificate and return
+// it along with any errors encountered constructing the PublicKey.
+//
+func (key_certificate KeyCertificate) ConstructPublicKey(data []byte) (public_key crypto.PublicKey, err error) {
+	key_type, err := key_certificate.SigningPublicKeyType()
+	if err != nil {
+		return
+	}
+	data_len := len(data)
+	if data_len < KEYCERT_PUBKEY_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "(KeyCertificate) ConstructPublicKey",
+			"data_len":     data_len,
+			"required_len": KEYCERT_PUBKEY_SIZE,
+			"reason":       "not enough data",
+		}).Error("error constructing public key")
+		err = errors.New("error constructing public key: not enough data")
+		return
+	}
+	switch key_type {
+	case KEYCERT_CRYPTO_ELG:
+		var elg_key crypto.ElgPublicKey
+		copy(elg_key[:], data[KEYCERT_PUBKEY_SIZE-KEYCERT_CRYPTO_ELG_SIZE:KEYCERT_PUBKEY_SIZE])
+		public_key = elg_key
+	}
+	return
+}
+
+//
+// Given some bytes, build a SigningPublicKey using any excess data that may be stored in the KeyCertificate and return
+// it along with any errors encountered constructing the SigningPublicKey.
+//
+func (key_certificate KeyCertificate) ConstructSigningPublicKey(data []byte) (signing_public_key crypto.SigningPublicKey, err error) {
+	signing_key_type, err := key_certificate.PublicKeyType()
+	if err != nil {
+		return
+	}
+	data_len := len(data)
+	if data_len < KEYCERT_SPK_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "(KeyCertificate) ConstructSigningPublicKey",
+			"data_len":     data_len,
+			"required_len": KEYCERT_SPK_SIZE,
+			"reason":       "not enough data",
+		}).Error("error constructing signing public key")
+		err = errors.New("error constructing signing public key: not enough data")
+		return
+	}
+	switch signing_key_type {
+	case KEYCERT_SIGN_DSA_SHA1:
+		var dsa_key crypto.DSAPublicKey
+		copy(dsa_key[:], data[KEYCERT_SPK_SIZE-KEYCERT_SIGN_DSA_SHA1_SIZE:KEYCERT_SPK_SIZE])
+		signing_public_key = dsa_key
+	case KEYCERT_SIGN_P256:
+		var ec_key crypto.ECP256PublicKey
+		copy(ec_key[:], data[KEYCERT_SPK_SIZE-KEYCERT_SIGN_P256_SIZE:KEYCERT_SPK_SIZE])
+		signing_public_key = ec_key
+	case KEYCERT_SIGN_P384:
+		var ec_key crypto.ECP384PublicKey
+		copy(ec_key[:], data[KEYCERT_SPK_SIZE-KEYCERT_SIGN_P384_SIZE:KEYCERT_SPK_SIZE])
+		signing_public_key = ec_key
+	case KEYCERT_SIGN_P521:
+		var ec_key crypto.ECP521PublicKey
+		extra := KEYCERT_SIGN_P521_SIZE - KEYCERT_SPK_SIZE
+		copy(ec_key[:], data)
+		d, _ := key_certificate.Data()
+		copy(ec_key[KEYCERT_SPK_SIZE:], d[4:4+extra])
+		signing_public_key = ec_key
+	case KEYCERT_SIGN_RSA2048:
+		//var rsa_key crypto.RSA2048PublicKey
+		//extra := KEYCERT_SIGN_RSA2048_SIZE - 128
+		//copy(rsa_key[:], data)
+		//copy(rsa_key[128:], key_certificate[4:4+extra])
+		//signing_public_key = rsa_key
+	case KEYCERT_SIGN_RSA3072:
+	case KEYCERT_SIGN_RSA4096:
+	case KEYCERT_SIGN_ED25519:
+	case KEYCERT_SIGN_ED25519PH:
+	}
+	return
+}
+
+//
+// Return the size of a Signature corresponding to the Key Certificate's
+// SigningPublicKey type.
+//
+func (key_certificate KeyCertificate) SignatureSize() (size int) {
+	sizes := map[int]int{
+		KEYCERT_SIGN_DSA_SHA1:  40,
+		KEYCERT_SIGN_P256:      64,
+		KEYCERT_SIGN_P384:      96,
+		KEYCERT_SIGN_P521:      132,
+		KEYCERT_SIGN_RSA2048:   256,
+		KEYCERT_SIGN_RSA3072:   384,
+		KEYCERT_SIGN_RSA4096:   512,
+		KEYCERT_SIGN_ED25519:   64,
+		KEYCERT_SIGN_ED25519PH: 64,
+	}
+	key_type, err := key_certificate.SigningPublicKeyType()
+	if err != nil {
+		log.WithFields(log.Fields{
+			"at":       "(KeyCertificate) SignatureSize",
+			"key_type": key_type,
+			"reason":   "failed to read signing public key type",
+		}).Error("error getting signature size")
+		return 0
+	}
+	return sizes[int(key_type)]
+}
+
+//
+// Read a KeyCertificate from a slice of bytes
+//
+func ReadKeyCertificate(data []byte) (key_certificate KeyCertificate, err error) {
+	key_certificate.SPKType = &Integer{}
+	key_certificate.PKType = &Integer{}
+	cert, remainder, err := ReadCertificate(data)
+	if err != nil {
+		return
+	}
+	cert_type, _, err := cert.Type()
+	if err != nil {
+		return
+	}
+	log.Println("KEYSANDCERT CERT TYPE=", cert_type, cert.CertBytes, remainder)
+	key_certificate.CertificateInterface = cert
+	data = cert.Cert()
+	data_len := len(data)
+	if data_len < KEYCERT_MIN_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "(KeyCertificate) PublicKeyType",
+			"data_len":     data_len,
+			"required_len": KEYCERT_MIN_SIZE,
+			"reason":       "not enough data",
+		}).Error("error parsing key certificate public key")
+		err = errors.New("error parsing key certificate public key: not enough data")
+		return
+	}
+	log.Println("KEYSANDCERT=", data, "| len=", data_len, "| 0=", data[0], "| 1=", data[1])
+	key_certificate.SPKType, err = NewInteger(data[len(data)-2 : len(data)])
+	if err != nil {
+		log.WithFields(log.Fields{
+			"at":       "(KeyCertificate) SigningPublicKeyType",
+			"key_type": key_certificate.PKType,
+			"reason":   "failed to read signing public key type",
+		}).Error("error parsing key certificate signing public key")
+	}
+	key_certificate.PKType, err = NewInteger(data[len(data)-4 : len(data)-2])
+	if err != nil {
+		log.WithFields(log.Fields{
+			"at":       "(KeyCertificate) PublicKeyType",
+			"key_type": key_certificate.PKType,
+			"reason":   "failed to read public key type",
+		}).Error("error parsing key certificate public key")
+		err = errors.New("error parsing key certificate public key: not enough data")
+	}
+	return
+}

lib/common/key_certificate/doc.md

@@ -1,154 +0,0 @@
-# key_certificate
---
-    import "github.com/go-i2p/go-i2p/lib/common/key_certificate"
-
-Package key_certificate implements the I2P Destination common data structure
-
-## Usage
-
-```go
-const (
-	KEYCERT_SIGN_DSA_SHA1 = iota
-	KEYCERT_SIGN_P256
-	KEYCERT_SIGN_P384
-	KEYCERT_SIGN_P521
-	KEYCERT_SIGN_RSA2048
-	KEYCERT_SIGN_RSA3072
-	KEYCERT_SIGN_RSA4096
-	KEYCERT_SIGN_ED25519
-	KEYCERT_SIGN_ED25519PH
-)
-```
-Key Certificate Signing Key Types
-
-```go
-const (
-	KEYCERT_CRYPTO_ELG = iota
-	KEYCERT_CRYPTO_P256
-	KEYCERT_CRYPTO_P384
-	KEYCERT_CRYPTO_P521
-	KEYCERT_CRYPTO_X25519
-)
-```
-Key Certificate Public Key Types
-
-```go
-const (
-	KEYCERT_SIGN_DSA_SHA1_SIZE  = 128
-	KEYCERT_SIGN_P256_SIZE      = 64
-	KEYCERT_SIGN_P384_SIZE      = 96
-	KEYCERT_SIGN_P521_SIZE      = 132
-	KEYCERT_SIGN_RSA2048_SIZE   = 256
-	KEYCERT_SIGN_RSA3072_SIZE   = 384
-	KEYCERT_SIGN_RSA4096_SIZE   = 512
-	KEYCERT_SIGN_ED25519_SIZE   = 32
-	KEYCERT_SIGN_ED25519PH_SIZE = 32
-)
-```
-SigningPublicKey sizes for Signing Key Types
-
-```go
-const (
-	KEYCERT_CRYPTO_ELG_SIZE    = 256
-	KEYCERT_CRYPTO_P256_SIZE   = 64
-	KEYCERT_CRYPTO_P384_SIZE   = 96
-	KEYCERT_CRYPTO_P521_SIZE   = 132
-	KEYCERT_CRYPTO_X25519_SIZE = 32
-)
-```
-PublicKey sizes for Public Key Types
-
-```go
-const (
-	KEYCERT_PUBKEY_SIZE = 256
-	KEYCERT_SPK_SIZE    = 128
-)
-```
-Sizes of structures in KeyCertificates
-
-```go
-const (
-	KEYCERT_MIN_SIZE = 7
-)
-```
-
-#### type KeyCertificate
-
-```go
-type KeyCertificate struct {
-	Certificate
-}
-```
-
-type KeyCertificate []byte
-
-#### func  KeyCertificateFromCertificate
-
-```go
-func KeyCertificateFromCertificate(certificate Certificate) *KeyCertificate
-```
-KeyCertificateFromCertificate returns a *KeyCertificate from a *Certificate.
-
-#### func  NewKeyCertificate
-
-```go
-func NewKeyCertificate(bytes []byte) (key_certificate *KeyCertificate, remainder []byte, err error)
-```
-NewKeyCertificate creates a new *KeyCertificate from []byte using
-ReadCertificate. The remaining bytes after the specified length are also
-returned. Returns a list of errors that occurred during parsing.
-
-#### func (KeyCertificate) ConstructPublicKey
-
-```go
-func (key_certificate KeyCertificate) ConstructPublicKey(data []byte) (public_key crypto.PublicKey, err error)
-```
-ConstructPublicKey returns a PublicKey constructed using any excess data that
-may be stored in the KeyCertififcate. Returns enr errors encountered while
-parsing.
-
-#### func (KeyCertificate) ConstructSigningPublicKey
-
-```go
-func (key_certificate KeyCertificate) ConstructSigningPublicKey(data []byte) (signing_public_key crypto.SigningPublicKey, err error)
-```
-ConstructSigningPublicKey returns a SingingPublicKey constructed using any
-excess data that may be stored in the KeyCertificate. Returns any errors
-encountered while parsing.
-
-#### func (KeyCertificate) CryptoSize
-
-```go
-func (key_certificate KeyCertificate) CryptoSize() (size int)
-```
-CryptoSize return the size of a Public Key corresponding to the Key
-Certificate's PublicKey type.
-
-#### func (KeyCertificate) Data
-
-```go
-func (key_certificate KeyCertificate) Data() ([]byte, error)
-```
-Data returns the raw []byte contained in the Certificate.
-
-#### func (KeyCertificate) PublicKeyType
-
-```go
-func (key_certificate KeyCertificate) PublicKeyType() (pubkey_type int)
-```
-PublicKeyType returns the PublicKey type as a Go integer.
-
-#### func (KeyCertificate) SignatureSize
-
-```go
-func (key_certificate KeyCertificate) SignatureSize() (size int)
-```
-SignatureSize return the size of a Signature corresponding to the Key
-Certificate's SigningPublicKey type.
-
-#### func (KeyCertificate) SigningPublicKeyType
-
-```go
-func (key_certificate KeyCertificate) SigningPublicKeyType() (signing_pubkey_type int)
-```
-SigningPublicKeyType returns the SigningPublicKey type as a Go integer.

lib/common/key_certificate/key_certificate.go

@@ -1,256 +0,0 @@
-// Package key_certificate implements the I2P Destination common data structure
-package key_certificate
-
-/*
-I2P Key Certificate
-https://geti2p.net/spec/common-structures#certificate
-Accurate for version 0.9.24
-
-+----+----+----+----+----+-//
-|type| length  | payload
-+----+----+----+----+----+-//
-
-type :: Integer
-        length -> 1 byte
-
-        case 0 -> NULL
-        case 1 -> HASHCASH
-        case 2 -> HIDDEN
-        case 3 -> SIGNED
-        case 4 -> MULTIPLE
-        case 5 -> KEY
-
-length :: Integer
-          length -> 2 bytes
-
-payload :: data
-           length -> $length bytes
-*/
-
-import (
-	"errors"
-
-	. "github.com/go-i2p/go-i2p/lib/common/certificate"
-	. "github.com/go-i2p/go-i2p/lib/common/data"
-	"github.com/go-i2p/go-i2p/lib/crypto"
-	log "github.com/sirupsen/logrus"
-)
-
-// Key Certificate Signing Key Types
-const (
-	KEYCERT_SIGN_DSA_SHA1 = iota
-	KEYCERT_SIGN_P256
-	KEYCERT_SIGN_P384
-	KEYCERT_SIGN_P521
-	KEYCERT_SIGN_RSA2048
-	KEYCERT_SIGN_RSA3072
-	KEYCERT_SIGN_RSA4096
-	KEYCERT_SIGN_ED25519
-	KEYCERT_SIGN_ED25519PH
-)
-
-// Key Certificate Public Key Types
-const (
-	KEYCERT_CRYPTO_ELG = iota
-	KEYCERT_CRYPTO_P256
-	KEYCERT_CRYPTO_P384
-	KEYCERT_CRYPTO_P521
-	KEYCERT_CRYPTO_X25519
-)
-
-const (
-	KEYCERT_MIN_SIZE = 7
-)
-
-// SigningPublicKey sizes for Signing Key Types
-const (
-	KEYCERT_SIGN_DSA_SHA1_SIZE  = 128
-	KEYCERT_SIGN_P256_SIZE      = 64
-	KEYCERT_SIGN_P384_SIZE      = 96
-	KEYCERT_SIGN_P521_SIZE      = 132
-	KEYCERT_SIGN_RSA2048_SIZE   = 256
-	KEYCERT_SIGN_RSA3072_SIZE   = 384
-	KEYCERT_SIGN_RSA4096_SIZE   = 512
-	KEYCERT_SIGN_ED25519_SIZE   = 32
-	KEYCERT_SIGN_ED25519PH_SIZE = 32
-)
-
-// PublicKey sizes for Public Key Types
-const (
-	KEYCERT_CRYPTO_ELG_SIZE    = 256
-	KEYCERT_CRYPTO_P256_SIZE   = 64
-	KEYCERT_CRYPTO_P384_SIZE   = 96
-	KEYCERT_CRYPTO_P521_SIZE   = 132
-	KEYCERT_CRYPTO_X25519_SIZE = 32
-)
-
-// Sizes of structures in KeyCertificates
-const (
-	KEYCERT_PUBKEY_SIZE = 256
-	KEYCERT_SPK_SIZE    = 128
-)
-
-// type KeyCertificate []byte
-type KeyCertificate struct {
-	Certificate
-	spkType Integer
-	cpkType Integer
-}
-
-// Data returns the raw []byte contained in the Certificate.
-func (key_certificate KeyCertificate) Data() ([]byte, error) {
-	return key_certificate.Certificate.RawBytes(), nil
-}
-
-// SigningPublicKeyType returns the SigningPublicKey type as a Go integer.
-func (key_certificate KeyCertificate) SigningPublicKeyType() (signing_pubkey_type int) {
-	return key_certificate.spkType.Int()
-}
-
-// PublicKeyType returns the PublicKey type as a Go integer.
-func (key_certificate KeyCertificate) PublicKeyType() (pubkey_type int) {
-	return key_certificate.cpkType.Int()
-}
-
-// ConstructPublicKey returns a PublicKey constructed using any excess data that may be stored in the KeyCertififcate.
-// Returns enr errors encountered while parsing.
-func (key_certificate KeyCertificate) ConstructPublicKey(data []byte) (public_key crypto.PublicKey, err error) {
-	key_type := key_certificate.PublicKeyType()
-	if err != nil {
-		return
-	}
-	data_len := len(data)
-	if data_len < key_certificate.CryptoSize() {
-		log.WithFields(log.Fields{
-			"at":           "(KeyCertificate) ConstructPublicKey",
-			"data_len":     data_len,
-			"required_len": KEYCERT_PUBKEY_SIZE,
-			"reason":       "not enough data",
-		}).Error("error constructing public key")
-		err = errors.New("error constructing public key: not enough data")
-		return
-	}
-	switch key_type {
-	case KEYCERT_CRYPTO_ELG:
-		var elg_key crypto.ElgPublicKey
-		copy(elg_key[:], data[KEYCERT_PUBKEY_SIZE-KEYCERT_CRYPTO_ELG_SIZE:KEYCERT_PUBKEY_SIZE])
-		public_key = elg_key
-	case KEYCERT_CRYPTO_X25519:
-		var ed25519_key crypto.Ed25519PublicKey
-		copy(ed25519_key[:], data[KEYCERT_PUBKEY_SIZE-KEYCERT_CRYPTO_ELG_SIZE:KEYCERT_PUBKEY_SIZE])
-		public_key = ed25519_key
-	}
-	return
-}
-
-// ConstructSigningPublicKey returns a SingingPublicKey constructed using any excess data that may be stored in the KeyCertificate.
-// Returns any errors encountered while parsing.
-func (key_certificate KeyCertificate) ConstructSigningPublicKey(data []byte) (signing_public_key crypto.SigningPublicKey, err error) {
-	signing_key_type := key_certificate.PublicKeyType()
-	if err != nil {
-		return
-	}
-	data_len := len(data)
-	if data_len < key_certificate.SignatureSize() {
-		log.WithFields(log.Fields{
-			"at":           "(KeyCertificate) ConstructSigningPublicKey",
-			"data_len":     data_len,
-			"required_len": KEYCERT_SPK_SIZE,
-			"reason":       "not enough data",
-		}).Error("error constructing signing public key")
-		err = errors.New("error constructing signing public key: not enough data")
-		return
-	}
-	switch signing_key_type {
-	case KEYCERT_SIGN_DSA_SHA1:
-		var dsa_key crypto.DSAPublicKey
-		copy(dsa_key[:], data[KEYCERT_SPK_SIZE-KEYCERT_SIGN_DSA_SHA1_SIZE:KEYCERT_SPK_SIZE])
-		signing_public_key = dsa_key
-	case KEYCERT_SIGN_P256:
-		var ec_key crypto.ECP256PublicKey
-		copy(ec_key[:], data[KEYCERT_SPK_SIZE-KEYCERT_SIGN_P256_SIZE:KEYCERT_SPK_SIZE])
-		signing_public_key = ec_key
-	case KEYCERT_SIGN_P384:
-		var ec_key crypto.ECP384PublicKey
-		copy(ec_key[:], data[KEYCERT_SPK_SIZE-KEYCERT_SIGN_P384_SIZE:KEYCERT_SPK_SIZE])
-		signing_public_key = ec_key
-	case KEYCERT_SIGN_P521:
-		var ec_key crypto.ECP521PublicKey
-		extra := KEYCERT_SIGN_P521_SIZE - KEYCERT_SPK_SIZE
-		copy(ec_key[:], data)
-		copy(ec_key[KEYCERT_SPK_SIZE:], key_certificate.Certificate.RawBytes()[4:4+extra])
-		signing_public_key = ec_key
-	case KEYCERT_SIGN_RSA2048:
-		// var rsa_key crypto.RSA2048PublicKey
-		// extra := KEYCERT_SIGN_RSA2048_SIZE - 128
-		// copy(rsa_key[:], data)
-		// copy(rsa_key[128:], key_certificate[4:4+extra])
-		// signing_public_key = rsa_key
-	case KEYCERT_SIGN_RSA3072:
-	case KEYCERT_SIGN_RSA4096:
-	case KEYCERT_SIGN_ED25519:
-	case KEYCERT_SIGN_ED25519PH:
-	}
-	return
-}
-
-// SignatureSize return the size of a Signature corresponding to the Key Certificate's SigningPublicKey type.
-func (key_certificate KeyCertificate) SignatureSize() (size int) {
-	sizes := map[int]int{
-		KEYCERT_SIGN_DSA_SHA1:  KEYCERT_SIGN_DSA_SHA1_SIZE,
-		KEYCERT_SIGN_P256:      KEYCERT_SIGN_P256_SIZE,
-		KEYCERT_SIGN_P384:      KEYCERT_SIGN_P384_SIZE,
-		KEYCERT_SIGN_P521:      KEYCERT_SIGN_P521_SIZE,
-		KEYCERT_SIGN_RSA2048:   KEYCERT_SIGN_RSA2048_SIZE,
-		KEYCERT_SIGN_RSA3072:   KEYCERT_SIGN_RSA3072_SIZE,
-		KEYCERT_SIGN_RSA4096:   KEYCERT_SIGN_RSA4096_SIZE,
-		KEYCERT_SIGN_ED25519:   KEYCERT_SIGN_ED25519_SIZE,
-		KEYCERT_SIGN_ED25519PH: KEYCERT_SIGN_ED25519PH_SIZE,
-	}
-	key_type := key_certificate.SigningPublicKeyType()
-	return sizes[int(key_type)]
-}
-
-// CryptoSize return the size of a Public Key corresponding to the Key Certificate's PublicKey type.
-func (key_certificate KeyCertificate) CryptoSize() (size int) {
-	sizes := map[int]int{
-		KEYCERT_CRYPTO_ELG:    KEYCERT_CRYPTO_ELG_SIZE,
-		KEYCERT_CRYPTO_P256:   KEYCERT_CRYPTO_P256_SIZE,
-		KEYCERT_CRYPTO_P384:   KEYCERT_CRYPTO_P384_SIZE,
-		KEYCERT_CRYPTO_P521:   KEYCERT_CRYPTO_P521_SIZE,
-		KEYCERT_CRYPTO_X25519: KEYCERT_CRYPTO_X25519_SIZE,
-	}
-	key_type := key_certificate.PublicKeyType()
-	return sizes[int(key_type)]
-}
-
-// NewKeyCertificate creates a new *KeyCertificate from []byte using ReadCertificate.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func NewKeyCertificate(bytes []byte) (key_certificate *KeyCertificate, remainder []byte, err error) {
-	var certificate Certificate
-	certificate, remainder, err = ReadCertificate(bytes)
-	if err != nil {
-		return
-	}
-	if len(bytes) < KEYCERT_MIN_SIZE {
-		err = errors.New("error parsing key certificate: not enough data")
-		remainder = bytes[KEYCERT_MIN_SIZE:]
-	}
-	key_certificate = &KeyCertificate{
-		Certificate: certificate,
-	}
-	if len(bytes) >= 5 {
-		key_certificate.spkType = Integer(bytes[4:5])
-	}
-	if len(bytes) >= 7 {
-		key_certificate.cpkType = Integer(bytes[6:7])
-	}
-	return
-}
-
-// KeyCertificateFromCertificate returns a *KeyCertificate from a *Certificate.
-func KeyCertificateFromCertificate(certificate Certificate) *KeyCertificate {
-	k, _, _ := NewKeyCertificate(certificate.RawBytes())
-	return k
-}

lib/common/key_certificate_test.go

@@ -1,4 +1,4 @@
-package key_certificate
+package common
 
 import (
 	"testing"
@@ -9,52 +9,60 @@ import (
 func TestSingingPublicKeyTypeReturnsCorrectInteger(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00})
-	pk_type := key_cert.SigningPublicKeyType()
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00})
+	assert.Nil(err, "ReadKeyCertificate() returned error with valid data")
+	spk_type, err := key_cert.SigningPublicKeyType()
 
 	assert.Nil(err, "SigningPublicKeyType() returned error with valid data")
-	assert.Equal(pk_type, KEYCERT_SIGN_P521, "SigningPublicKeyType() did not return correct typec")
+	assert.Equal(spk_type, KEYCERT_SIGN_DSA_SHA1, "SigningPublicKeyType() did not return correct type")
 }
 
-func TestSingingPublicKeyTypeReportsWhenDataTooSmall(t *testing.T) {
+func TestPublicKeyTypeReportsWhenDataTooSmall(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x01, 0x00})
-	sk_type := key_cert.SigningPublicKeyType()
-
-	assert.Equal(sk_type, 0, "SigningPublicKeyType() did not return correct typec")
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x01, 0x00})
+	if assert.NotNil(err) {
+		assert.Equal("error parsing key certificate public key: not enough data", err.Error(), "correct error message should be returned")
+	}
+	//	assert.NotNil(err, "ReadKeyCertificate() returned error with valid data")
+	_, err = key_cert.PublicKeyType()
 
 	if assert.NotNil(err) {
-		assert.Equal("error parsing key certificate: not enough data", err.Error(), "correct error message should be returned")
+		assert.Equal("error retrieving signing public key type: not enough data", err.Error(), "correct error message should be returned")
 	}
 }
 
 func TestPublicKeyTypeReturnsCorrectInteger(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03})
-	pk_type := key_cert.PublicKeyType()
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00})
+	assert.Nil(err, "ReadKeyCertificate() returned error with valid data")
+	pk_type, err := key_cert.PublicKeyType()
 
-	assert.Nil(err, "PublicKey() returned error with valid data")
-	assert.Equal(pk_type, KEYCERT_SIGN_P521, "PublicKeyType() did not return correct typec")
+	assert.Nil(err, "PublicKeyType() returned error with valid data")
+	assert.Equal(pk_type, KEYCERT_CRYPTO_P521, "PublicKeyType() did not return correct type")
 }
 
-func TestPublicKeyTypeReportsWhenDataTooSmall(t *testing.T) {
+func TestSigningPublicKeyTypeReportsWhenDataTooSmall(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x02, 0x00, 0x00})
-	pk_type := key_cert.PublicKeyType()
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x02, 0x00, 0x00})
+	if assert.NotNil(err) {
+		assert.Equal("error parsing key certificate public key: not enough data", err.Error(), "correct error message should be returned")
+	}
+	_, err = key_cert.SigningPublicKeyType()
 
 	if assert.NotNil(err) {
-		assert.Equal("error parsing key certificate: not enough data", err.Error(), "correct error message should be returned")
+		assert.Equal("error retrieving signing public key type: not enough data", err.Error(), "correct error message should be returned")
 	}
-	assert.Equal(pk_type, 0, "PublicKeyType() did not return correct typec")
 }
 
+/*
 func TestConstructPublicKeyReportsWhenDataTooSmall(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00})
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00})
+	assert.Nil(err, "ReadKeyCertificate() returned error with valid data")
 	data := make([]byte, 255)
 	_, err = key_cert.ConstructPublicKey(data)
 
@@ -62,22 +70,25 @@ func TestConstructPublicKeyReportsWhenDataTooSmall(t *testing.T) {
 		assert.Equal("error constructing public key: not enough data", err.Error(), "correct error message should be returned")
 	}
 }
-
+*/
+/*
 func TestConstructPublicKeyReturnsCorrectDataWithElg(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00})
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00})
+	assert.Nil(err, "ReadKeyCertificate() returned error with valid data")
 	data := make([]byte, 256)
 	pk, err := key_cert.ConstructPublicKey(data)
 
 	assert.Nil(err, "ConstructPublicKey() returned error with valid data")
 	assert.Equal(pk.Len(), 256, "ConstructPublicKey() did not return public key with correct length")
 }
-
+*/
+/*
 func TestConstructSigningPublicKeyReportsWhenDataTooSmall(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00})
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00})
 	data := make([]byte, 127)
 	_, err = key_cert.ConstructSigningPublicKey(data)
 
@@ -89,7 +100,7 @@ func TestConstructSigningPublicKeyReportsWhenDataTooSmall(t *testing.T) {
 func TestConstructSigningPublicKeyWithDSASHA1(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00})
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00})
 	data := make([]byte, 128)
 	spk, err := key_cert.ConstructSigningPublicKey(data)
 
@@ -100,7 +111,7 @@ func TestConstructSigningPublicKeyWithDSASHA1(t *testing.T) {
 func TestConstructSigningPublicKeyWithP256(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01})
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01})
 	data := make([]byte, 128)
 	spk, err := key_cert.ConstructSigningPublicKey(data)
 
@@ -111,7 +122,7 @@ func TestConstructSigningPublicKeyWithP256(t *testing.T) {
 func TestConstructSigningPublicKeyWithP384(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x02, 0x00, 0x02})
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x04, 0x00, 0x02, 0x00, 0x02})
 	data := make([]byte, 128)
 	spk, err := key_cert.ConstructSigningPublicKey(data)
 
@@ -122,10 +133,11 @@ func TestConstructSigningPublicKeyWithP384(t *testing.T) {
 func TestConstructSigningPublicKeyWithP521(t *testing.T) {
 	assert := assert.New(t)
 
-	key_cert, _, err := NewKeyCertificate([]byte{0x05, 0x00, 0x08, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00})
+	key_cert, err := ReadKeyCertificate([]byte{0x05, 0x00, 0x08, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00})
 	data := make([]byte, 128)
 	spk, err := key_cert.ConstructSigningPublicKey(data)
 
 	assert.Nil(err, "ConstructSigningPublicKey() with P521 returned err on valid data")
 	assert.Equal(spk.Len(), KEYCERT_SIGN_P521_SIZE, "ConstructSigningPublicKey() with P521 returned incorrect SigningPublicKey length")
 }
+*/

lib/common/keys_and_cert.go

@@ -0,0 +1,280 @@
+package common
+
+/*
+I2P KeysAndCert
+https://geti2p.net/spec/common-structures#keysandcert
+Accurate for version 0.9.24
+
++----+----+----+----+----+----+----+----+
+| public_key                            |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| padding (optional)                    |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| signing_key                           |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| certificate                           |
++----+----+----+-//
+
+public_key :: PublicKey (partial or full)
+              length -> 256 bytes or as specified in key certificate
+
+padding :: random data
+              length -> 0 bytes or as specified in key certificate
+              padding length + signing_key length == KEYS_AND_CERT_SPK_SIZE bytes
+
+signing__key :: SigningPublicKey (partial or full)
+              length -> 128 bytes or as specified in key certificate
+              padding length + signing_key length == KEYS_AND_CERT_SPK_SIZE bytes
+
+certificate :: Certificate
+               length -> >= 3 bytes
+
+total length: 387+ bytes
+*/
+
+import (
+	"errors"
+
+	"github.com/go-i2p/go-i2p/lib/crypto"
+	log "github.com/sirupsen/logrus"
+)
+
+// Sizes of various KeysAndCert structures and requirements
+const (
+	KEYS_AND_CERT_PUBKEY_SIZE = 256
+	KEYS_AND_CERT_SPK_SIZE    = 128
+	KEYS_AND_CERT_MIN_SIZE    = 387
+	KEYS_AND_CERT_DATA_SIZE   = 384
+)
+
+type KeysAndCertInterface interface {
+	GetPublicKey() (key crypto.PublicKey, err error)
+	GetSigningPublicKey() (signing_public_key crypto.SigningPublicKey, err error)
+	GetCertificate() (cert Certificate, err error)
+	Bytes() (bytes []byte)
+}
+
+type KeysAndCert struct {
+	crypto.SigningPublicKey
+	crypto.PublicKey
+	CertificateInterface
+}
+
+func (keys_and_cert KeysAndCert) Bytes() (bytes []byte) { //, err error) {
+	pubkey, _ := keys_and_cert.GetPublicKey()
+	signpubkey, _ := keys_and_cert.GetSigningPublicKey()
+	elg_key := pubkey.(crypto.ElgPublicKey)
+	dsa_key := signpubkey.(crypto.DSAPublicKey)
+	bytes = append(bytes, dsa_key[:]...)
+	bytes = append(bytes, elg_key[:]...)
+	bytes = append(bytes, keys_and_cert.CertificateInterface.Cert()...)
+	return
+}
+
+//
+// Return the PublicKey for this KeysAndCert, reading from the Key Certificate if it is present to
+// determine correct lengths.
+//
+func (keys_and_cert KeysAndCert) GetPublicKey() (key crypto.PublicKey, err error) {
+	data := make([]byte, KEYS_AND_CERT_PUBKEY_SIZE)
+	if keys_and_cert.PublicKey == nil {
+		epk := crypto.ElgPublicKey{}
+		copy(data[:KEYS_AND_CERT_PUBKEY_SIZE], epk[:])
+		keys_and_cert.PublicKey = epk
+		err = errors.New("error parsing KeysAndCert: data is smaller than minimum valid size")
+	}
+	/*cert, err := keys_and_cert.GetCertificate()
+	if err != nil {
+		return
+	}
+	cert_len, err := cert.Length()
+	if err != nil {
+		return
+	}
+	if cert_len != 0 {*/
+	key = keys_and_cert.PublicKey
+	/*}*/
+	return
+}
+
+//
+// Return the SigningPublicKey for this KeysAndCert, reading from the Key Certificate if it is present to
+// determine correct lengths.
+//
+func (keys_and_cert KeysAndCert) GetSigningPublicKey() (signing_public_key crypto.SigningPublicKey, err error) {
+	if keys_and_cert.SigningPublicKey == nil {
+		keys_and_cert.SigningPublicKey = crypto.DSAPublicKey{}
+		err = errors.New("error parsing KeysAndCert: data is smaller than minimum valid size")
+	}
+	/*cert, err := keys_and_cert.GetCertificate()
+	if err != nil {
+		return
+	}
+	cert_len, err := cert.Length()
+	if err != nil {
+		return
+	}
+	if cert_len != 0 {*/
+	signing_public_key = keys_and_cert.SigningPublicKey
+	/*}*/
+	return
+}
+
+//
+// Return the Certificate contained in the KeysAndCert and any errors encountered while parsing the
+// KeysAndCert or Certificate.
+//
+func (keys_and_cert KeysAndCert) GetCertificate() (cert CertificateInterface, err error) {
+	data_len := len(keys_and_cert.Bytes())
+	log.Println("LEN IS", data_len, "KEYS_AND_CERT_MIN_SIZE", KEYS_AND_CERT_MIN_SIZE)
+	if data_len < KEYS_AND_CERT_MIN_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "GetCertificate",
+			"data_len":     data_len,
+			"required_len": KEYS_AND_CERT_MIN_SIZE,
+			"reason":       "not enough data",
+		}).Error("error parsing keys and cert")
+		err = errors.New("certificate parsing warning: certificate data is shorter than specified by length")
+	}
+	/*if data_len > CERT_MIN_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "ReadKeysAndCert",
+			"data_len":     data_len,
+			"required_len": KEYS_AND_CERT_MIN_SIZE,
+			"reason":       "too much data",
+		}).Error("error parsing keys and cert")
+		err = errors.New("certificate parsing warning: certificate data is longer than specified by length")
+	}*/
+	cert = keys_and_cert.CertificateInterface
+	return
+}
+
+func ReadKeys(data []byte, cert CertificateInterface) (spk crypto.SigningPublicKey, pk crypto.PublicKey, remainder []byte, err error) {
+	data_len := len(data)
+	if data_len < KEYS_AND_CERT_MIN_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "ReadKeys",
+			"data_len":     data_len,
+			"required_len": KEYS_AND_CERT_MIN_SIZE,
+			"reason":       "not enough data",
+		}).Error("error parsing keys and cert")
+		err = errors.New("error parsing KeysAndCert: data is smaller than minimum valid size")
+		return
+	}
+	if cert == nil {
+		// No Certificate is present, return the KEYS_AND_CERT_PUBKEY_SIZE byte
+		// PublicKey space as ElgPublicKey.
+		var elg_key crypto.ElgPublicKey
+		copy(data[:KEYS_AND_CERT_PUBKEY_SIZE], elg_key[:])
+		pk = elg_key
+	} else {
+		// A Certificate is present in this KeysAndCert
+		cert_type, cert_bytes, e := cert.Type()
+		err = e
+		if cert_type == CERT_KEY {
+			// This KeysAndCert contains a Key Certificate, construct
+			// a PublicKey from the data in the KeysAndCert and
+			// any additional data in the Certificate.
+			cert_integer, _ := NewInteger(cert_bytes)
+			pk, err = KeyCertificate{PKType: cert_integer}.ConstructPublicKey(
+				data[:KEYS_AND_CERT_PUBKEY_SIZE],
+			)
+		} else {
+			// Key Certificate is not present, return the KEYS_AND_CERT_PUBKEY_SIZE byte
+			// PublicKey space as ElgPublicKey.  No other Certificate
+			// types are currently in use.
+			var elg_key crypto.ElgPublicKey
+			copy(data[:KEYS_AND_CERT_PUBKEY_SIZE], elg_key[:])
+			pk = elg_key
+			log.WithFields(log.Fields{
+				"at":        "(KeysAndCert) PublicKey",
+				"cert_type": cert_type,
+			}).Warn("unused certificate type observed")
+		}
+		//	}
+		if data_len == 0 {
+			// No Certificate is present, return the KEYS_AND_CERT_SPK_SIZE byte
+			// SigningPublicKey space as legacy DSA SHA1 SigningPublicKey.
+			var dsa_pk crypto.DSAPublicKey
+			copy(dsa_pk[:], data[KEYS_AND_CERT_PUBKEY_SIZE:KEYS_AND_CERT_PUBKEY_SIZE+KEYS_AND_CERT_SPK_SIZE])
+			spk = dsa_pk
+		} else {
+			// A Certificate is present in this KeysAndCert
+			cert_type, cert_bytes, e := cert.Type()
+			err = e
+			if cert_type == CERT_KEY {
+				// This KeysAndCert contains a Key Certificate, construct
+				// a SigningPublicKey from the data in the KeysAndCert and
+				// any additional data in the Certificate.
+				cert_integer, _ := NewInteger(cert_bytes)
+				spk, err = KeyCertificate{SPKType: cert_integer}.ConstructSigningPublicKey(
+					data[KEYS_AND_CERT_PUBKEY_SIZE : KEYS_AND_CERT_PUBKEY_SIZE+KEYS_AND_CERT_SPK_SIZE],
+				)
+			} else {
+				// Key Certificate is not present, return the KEYS_AND_CERT_SPK_SIZE byte
+				// SigningPublicKey space as legacy SHA DSA1 SigningPublicKey.
+				// No other Certificate types are currently in use.
+				var dsa_pk crypto.DSAPublicKey
+				copy(dsa_pk[:], data[KEYS_AND_CERT_PUBKEY_SIZE:KEYS_AND_CERT_PUBKEY_SIZE+KEYS_AND_CERT_SPK_SIZE])
+				spk = dsa_pk
+			}
+		}
+		cert_len, e := cert.Length()
+		err = e
+		if cert_len == 0 {
+			remainder = data[KEYS_AND_CERT_MIN_SIZE:]
+			return
+		}
+		remainder = data[KEYS_AND_CERT_PUBKEY_SIZE+KEYS_AND_CERT_SPK_SIZE:]
+	}
+	return
+
+}
+
+//
+// Read a KeysAndCert from a slice of bytes, retuning it and the remaining data as well as any errors
+// encoutered parsing the KeysAndCert.
+//
+func ReadKeysAndCert(data []byte) (keys_and_cert KeysAndCert, remainder []byte, err error) {
+	data_len := len(data)
+	keys_and_cert.CertificateInterface = &Certificate{}
+	if data_len < KEYS_AND_CERT_MIN_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "ReadKeysAndCert",
+			"data_len":     data_len,
+			"required_len": KEYS_AND_CERT_MIN_SIZE,
+			"reason":       "not enough data",
+		}).Error("error parsing keys and cert")
+		err = errors.New("error parsing KeysAndCert: data is smaller than minimum valid size")
+		return
+	}
+	cert, remainder, err := ReadCertificate(data[KEYS_AND_CERT_DATA_SIZE:])
+	if err != nil {
+		log.WithFields(log.Fields{
+			"at":           "ReadKeysAndCert",
+			"data_len":     data_len,
+			"required_len": KEYS_AND_CERT_MIN_SIZE,
+			"reason":       "error parsing certificate",
+		}).Error("error parsing keys and cert")
+		err = errors.New("error parsing KeysAndCert: error parsing certificate")
+		return
+	}
+	keys_and_cert.CertificateInterface = cert
+	spk, pk, remainder, err := ReadKeys(data, cert)
+	keys_and_cert.SigningPublicKey = spk
+	keys_and_cert.PublicKey = pk
+	return
+}

lib/common/keys_and_cert/doc.md

@@ -1,66 +0,0 @@
-# keys_and_cert
---
-    import "github.com/go-i2p/go-i2p/lib/common/keys_and_cert"
-
-Package keys_and_cert implements the I2P KeysAndCert common data structure
-
-## Usage
-
-```go
-const (
-	KEYS_AND_CERT_PUBKEY_SIZE = 256
-	KEYS_AND_CERT_SPK_SIZE    = 128
-	KEYS_AND_CERT_MIN_SIZE    = 387
-	KEYS_AND_CERT_DATA_SIZE   = 384
-)
-```
-Sizes of various KeysAndCert structures and requirements
-
-#### type KeysAndCert
-
-```go
-type KeysAndCert struct {
-	KeyCertificate *KeyCertificate
-}
-```
-
-KeysAndCert is the represenation of an I2P KeysAndCert.
-
-https://geti2p.net/spec/common-structures#keysandcert
-
-#### func  ReadKeysAndCert
-
-```go
-func ReadKeysAndCert(data []byte) (keys_and_cert KeysAndCert, remainder []byte, err error)
-```
-ReadKeysAndCert creates a new *KeysAndCert from []byte using ReadKeysAndCert.
-Returns a pointer to KeysAndCert unlike ReadKeysAndCert.
-
-#### func (KeysAndCert) Bytes
-
-```go
-func (keys_and_cert KeysAndCert) Bytes() []byte
-```
-Bytes returns the entire KeyCertificate in []byte form, trims payload to
-specified length.
-
-#### func (*KeysAndCert) Certificate
-
-```go
-func (keys_and_cert *KeysAndCert) Certificate() (cert Certificate)
-```
-Certfificate returns the certificate.
-
-#### func (*KeysAndCert) PublicKey
-
-```go
-func (keys_and_cert *KeysAndCert) PublicKey() (key crypto.PublicKey)
-```
-PublicKey returns the public key as a crypto.PublicKey.
-
-#### func (*KeysAndCert) SigningPublicKey
-
-```go
-func (keys_and_cert *KeysAndCert) SigningPublicKey() (signing_public_key crypto.SigningPublicKey)
-```
-SigningPublicKey returns the signing public key.

lib/common/keys_and_cert/keys_and_cert.go

@@ -1,144 +0,0 @@
-// Package keys_and_cert implements the I2P KeysAndCert common data structure
-package keys_and_cert
-
-import (
-	"errors"
-
-	. "github.com/go-i2p/go-i2p/lib/common/certificate"
-	. "github.com/go-i2p/go-i2p/lib/common/key_certificate"
-	"github.com/go-i2p/go-i2p/lib/crypto"
-	log "github.com/sirupsen/logrus"
-)
-
-// Sizes of various KeysAndCert structures and requirements
-const (
-	KEYS_AND_CERT_PUBKEY_SIZE = 256
-	KEYS_AND_CERT_SPK_SIZE    = 128
-	KEYS_AND_CERT_MIN_SIZE    = 387
-	KEYS_AND_CERT_DATA_SIZE   = 384
-)
-
-/*
-[KeysAndCert]
-Accurate for version 0.9.49
-
-Description
-An encryption public key, a signing public key, and a certificate, used as either a RouterIdentity or a Destination.
-
-Contents
-A PublicKey followed by a SigningPublicKey and then a Certificate.
-
-+----+----+----+----+----+----+----+----+
-| public_key                            |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| padding (optional)                    |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| signing_key                           |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| certificate                           |
-+----+----+----+-//
-
-public_key :: PublicKey (partial or full)
-              length -> 256 bytes or as specified in key certificate
-
-padding :: random data
-              length -> 0 bytes or as specified in key certificate
-              padding length + signing_key length == 128 bytes
-
-signing__key :: SigningPublicKey (partial or full)
-              length -> 128 bytes or as specified in key certificate
-              padding length + signing_key length == 128 bytes
-
-certificate :: Certificate
-               length -> >= 3 bytes
-
-total length: 387+ bytes
-*/
-
-// KeysAndCert is the represenation of an I2P KeysAndCert.
-//
-// https://geti2p.net/spec/common-structures#keysandcert
-type KeysAndCert struct {
-	KeyCertificate   *KeyCertificate
-	publicKey        crypto.PublicKey
-	padding          []byte
-	signingPublicKey crypto.SigningPublicKey
-}
-
-// Bytes returns the entire KeyCertificate in []byte form, trims payload to specified length.
-func (keys_and_cert KeysAndCert) Bytes() []byte {
-	return keys_and_cert.KeyCertificate.Bytes()
-}
-
-// PublicKey returns the public key as a crypto.PublicKey.
-func (keys_and_cert *KeysAndCert) PublicKey() (key crypto.PublicKey) {
-	return keys_and_cert.publicKey
-}
-
-// SigningPublicKey returns the signing public key.
-func (keys_and_cert *KeysAndCert) SigningPublicKey() (signing_public_key crypto.SigningPublicKey) {
-	return keys_and_cert.signingPublicKey
-}
-
-// Certfificate returns the certificate.
-func (keys_and_cert *KeysAndCert) Certificate() (cert Certificate) {
-	return keys_and_cert.KeyCertificate.Certificate
-}
-
-// ReadKeysAndCert creates a new *KeysAndCert from []byte using ReadKeysAndCert.
-// Returns a pointer to KeysAndCert unlike ReadKeysAndCert.
-func ReadKeysAndCert(data []byte) (keys_and_cert KeysAndCert, remainder []byte, err error) {
-	data_len := len(data)
-	// keys_and_cert = KeysAndCert{}
-	if data_len < KEYS_AND_CERT_MIN_SIZE && data_len > KEYS_AND_CERT_DATA_SIZE {
-		log.WithFields(log.Fields{
-			"at":           "ReadKeysAndCert",
-			"data_len":     data_len,
-			"required_len": KEYS_AND_CERT_MIN_SIZE,
-			"reason":       "not enough data",
-		}).Error("error parsing keys and cert")
-		err = errors.New("error parsing KeysAndCert: data is smaller than minimum valid size")
-		keys_and_cert.KeyCertificate, remainder, _ = NewKeyCertificate(data[KEYS_AND_CERT_DATA_SIZE:])
-		return
-	} else if data_len < KEYS_AND_CERT_DATA_SIZE {
-		log.WithFields(log.Fields{
-			"at":           "ReadKeysAndCert",
-			"data_len":     data_len,
-			"required_len": KEYS_AND_CERT_MIN_SIZE,
-			"reason":       "not enough data",
-		}).Error("error parsing keys and cert")
-		err = errors.New("error parsing KeysAndCert: data is smaller than minimum valid size")
-		return
-	}
-	keys_and_cert.KeyCertificate, remainder, err = NewKeyCertificate(data[KEYS_AND_CERT_DATA_SIZE:])
-	if err != nil {
-		return
-	}
-	// TODO: this only supports one key type right now and it's the old key type, but the layout is the same.
-	// a case-switch which sets the size of the SPK and the PK should be used to replace the referenced KEYS_AND_CERT_PUBKEY_SIZE
-	// and KEYS_AND_CERT_SPK_SIZE constants in the future.
-	keys_and_cert.publicKey, err = keys_and_cert.KeyCertificate.ConstructPublicKey(data[:keys_and_cert.KeyCertificate.CryptoSize()])
-	if err != nil {
-		return
-	}
-	keys_and_cert.signingPublicKey, err = keys_and_cert.KeyCertificate.ConstructSigningPublicKey(data[KEYS_AND_CERT_DATA_SIZE-keys_and_cert.KeyCertificate.SignatureSize() : KEYS_AND_CERT_DATA_SIZE])
-	if err != nil {
-		return
-	}
-	padding := data[KEYS_AND_CERT_PUBKEY_SIZE : KEYS_AND_CERT_DATA_SIZE-KEYS_AND_CERT_SPK_SIZE]
-	keys_and_cert.padding = padding
-	return
-}

lib/common/keys_and_cert/private_keys_and_cert.go

@@ -1,18 +0,0 @@
-package keys_and_cert
-
-import "crypto"
-
-// PrivateKeysAndCert contains a KeysAndCert along with the corresponding private keys for the
-// Public Key and the Signing Public Key
-type PrivateKeysAndCert struct {
-	KeysAndCert
-	PK_KEY crypto.PrivateKey
-	SPK_KEY crypto.PrivateKey
-}
-
-func NewPrivateKeysAndCert() (*PrivateKeysAndCert, error) {
-	var pkc PrivateKeysAndCert
-	var err error
-	//pkc.PK_KEY, err = 
-	return &pkc, err
-}

lib/common/keys_and_cert_test.go

@@ -1,4 +1,4 @@
-package keys_and_cert
+package common
 
 import (
 	"testing"
@@ -6,17 +6,29 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-/*func TestCertificateWithMissingData(t *testing.T) {
+func TestCertificateWithMissingData(t *testing.T) {
 	assert := assert.New(t)
 
-	cert_data := []byte{0x05, 0x00, 0x04, 0x00, 0x01}
+	//cert_data := []byte{0x05, 0x00, 0x04, 0x00, 0x01}
 	data := make([]byte, 128+256)
-	data = append(data, cert_data...)
-	_, _, err := NewKeysAndCert(data)
+	//data = append(data, cert_data...)
+	keys_and_cert, remainder, err := ReadKeysAndCert(data)
+	if assert.NotNil(err) {
+		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
+	}
+	t.Log("\n\nREMAINDER", remainder, "\n\n")
+	cert, err := keys_and_cert.GetCertificate()
+	t.Log("\n\nSTART\n\n")
 	if assert.NotNil(err) {
 		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
+	} else {
+		t.Log("\n\nEND\n\n", cert.Cert())
 	}
-}*/
+	//	cert_bytes := []byte(cert.Cert())
+	//	if assert.Equal(len(cert_data), len(cert_bytes)) {
+	//	assert.Equal(cert_bytes, cert_data, "keys_and_cert.GetCertificate() did not return available data when cert was missing some data")
+	//	}
+}
 
 func TestCertificateWithValidData(t *testing.T) {
 	assert := assert.New(t)
@@ -25,13 +37,12 @@ func TestCertificateWithValidData(t *testing.T) {
 	data := make([]byte, 128+256)
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
+
+	cert, err := keys_and_cert.GetCertificate()
 	assert.Nil(err)
-
-	cert := keys_and_cert.Certificate()
-
-	cert_bytes := cert.Bytes()
+	cert_bytes := []byte(cert.Cert())
 	if assert.Equal(len(cert_data), len(cert_bytes)) {
-		assert.Equal(cert_bytes, cert_data, "keys_and_cert.Certificate() did not return correct data with valid cert")
+		assert.Equal(cert_bytes, cert_data, "keys_and_cert.GetCertificate() did not return correct data with valid cert")
 	}
 }
 
@@ -45,11 +56,13 @@ func TestPublicKeyWithBadData(t *testing.T) {
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
 
-	pub_key := keys_and_cert.PublicKey()
+	//pub_key
+	_, err = keys_and_cert.GetPublicKey()
 	if assert.NotNil(err) {
 		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
 	}
-	assert.Nil(pub_key)
+	//TODO: pub_key in this instance is a null key(all zeros). This test should be changed to check for this.
+	//assert.Nil(pub_key)
 }
 
 func TestPublicKeyWithBadCertificate(t *testing.T) {
@@ -62,11 +75,13 @@ func TestPublicKeyWithBadCertificate(t *testing.T) {
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
 
-	pub_key := keys_and_cert.PublicKey()
+	//pub_key
+	_, err = keys_and_cert.GetPublicKey()
 	if assert.NotNil(err) {
-		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
+		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
 	}
-	assert.Nil(pub_key)
+	//TODO: pub_key in this instance is a null key(all zeros). This test should be changed to check for this.
+	//assert.Nil(pub_key)
 }
 
 func TestPublicKeyWithNullCertificate(t *testing.T) {
@@ -79,7 +94,7 @@ func TestPublicKeyWithNullCertificate(t *testing.T) {
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
 
-	pub_key := keys_and_cert.PublicKey()
+	pub_key, err := keys_and_cert.GetPublicKey()
 	assert.Nil(err)
 	assert.Equal(len(pub_key_data), pub_key.Len())
 }
@@ -93,8 +108,9 @@ func TestPublicKeyWithKeyCertificate(t *testing.T) {
 	data = append(data, pub_key_data...)
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
+	assert.Nil(err)
 
-	pub_key := keys_and_cert.PublicKey()
+	pub_key, err := keys_and_cert.GetPublicKey()
 	assert.Nil(err)
 	assert.Equal(len(pub_key_data), pub_key.Len())
 }
@@ -109,7 +125,7 @@ func TestSigningPublicKeyWithBadData(t *testing.T) {
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
 
-	signing_pub_key := keys_and_cert.SigningPublicKey()
+	signing_pub_key, err := keys_and_cert.GetSigningPublicKey()
 	if assert.NotNil(err) {
 		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
 	}
@@ -126,7 +142,7 @@ func TestSigningPublicKeyWithBadCertificate(t *testing.T) {
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
 
-	signing_pub_key := keys_and_cert.SigningPublicKey()
+	signing_pub_key, err := keys_and_cert.GetSigningPublicKey()
 	if assert.NotNil(err) {
 		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
 	}
@@ -143,7 +159,7 @@ func TestSigningPublicKeyWithNullCertificate(t *testing.T) {
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
 
-	signing_pub_key := keys_and_cert.SigningPublicKey()
+	signing_pub_key, err := keys_and_cert.GetSigningPublicKey()
 	assert.Nil(err)
 	assert.Equal(len(signing_pub_key_data), signing_pub_key.Len())
 }
@@ -158,74 +174,128 @@ func TestSigningPublicKeyWithKeyCertificate(t *testing.T) {
 	data = append(data, cert_data...)
 	keys_and_cert, _, err := ReadKeysAndCert(data)
 
-	signing_pub_key := keys_and_cert.SigningPublicKey()
+	signing_pub_key, err := keys_and_cert.GetSigningPublicKey()
 	assert.Nil(err)
 	assert.Equal(len(signing_pub_key_data), signing_pub_key.Len())
 }
 
-func TestNewKeysAndCertWithMissingData(t *testing.T) {
+func TestReadKeysAndCertWithMissingData(t *testing.T) {
 	assert := assert.New(t)
 
 	cert_data := make([]byte, 128)
-	_, remainder, err := ReadKeysAndCert(cert_data)
+	keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
 	assert.Equal(0, len(remainder))
 	if assert.NotNil(err) {
 		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
 	}
+
+	_, err = keys_and_cert.GetPublicKey()
+	if assert.NotNil(err) {
+		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
+	}
+	_, err = keys_and_cert.GetSigningPublicKey()
+	if assert.NotNil(err) {
+		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
+	}
+	_, err = keys_and_cert.GetCertificate()
+	if assert.NotNil(err) {
+		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
+	}
 }
 
-func TestNewKeysAndCertWithMissingCertData(t *testing.T) {
+func TestReadKeysAndCertWithMissingCertData(t *testing.T) {
 	assert := assert.New(t)
 
 	cert_data := make([]byte, 128+256)
 	cert_data = append(cert_data, []byte{0x05, 0x00, 0x04, 0x00, 0x01}...)
-	_, remainder, err := ReadKeysAndCert(cert_data)
+	keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
 	assert.Equal(0, len(remainder))
 	if assert.NotNil(err) {
 		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
 	}
+
+	_, err = keys_and_cert.GetPublicKey()
+	if assert.NotNil(err) {
+		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
+	}
+	_, err = keys_and_cert.GetSigningPublicKey()
+	if assert.NotNil(err) {
+		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
+	}
+	_, err = keys_and_cert.GetCertificate()
+	if assert.NotNil(err) {
+		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
+	}
 }
 
-func TestNewKeysAndCertWithValidDataWithCertificate(t *testing.T) {
+func TestReadKeysAndCertWithValidDataWithCertificate(t *testing.T) {
 	assert := assert.New(t)
 
 	cert_data := make([]byte, 128+256)
 	cert_data = append(cert_data, []byte{0x05, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00}...)
-	_, remainder, err := ReadKeysAndCert(cert_data)
+	keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
 	assert.Equal(0, len(remainder))
 	assert.Nil(err)
+
+	_, err = keys_and_cert.GetPublicKey()
+	assert.Nil(err, "keys_and_cert.GetPublicKey() returned error with valid data containing certificate")
+	_, err = keys_and_cert.GetSigningPublicKey()
+	assert.Nil(err, "keys_and_cert.GetSigningPublicKey() returned error with valid data containing certificate")
+	_, err = keys_and_cert.GetCertificate()
+	assert.Nil(err, "keys_and_cert.GetCertificate() returned error with valid data containing certificate")
 }
 
-func TestNewKeysAndCertWithValidDataWithoutCertificate(t *testing.T) {
+func TestReadKeysAndCertWithValidDataWithoutCertificate(t *testing.T) {
 	assert := assert.New(t)
 
 	cert_data := make([]byte, 128+256)
 	cert_data = append(cert_data, []byte{0x00, 0x00, 0x00}...)
-	_, remainder, err := ReadKeysAndCert(cert_data)
+	keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
 	assert.Equal(0, len(remainder))
 	assert.Nil(err)
+
+	_, err = keys_and_cert.GetPublicKey()
+	assert.Nil(err, "keys_and_cert.GetPublicKey() returned error with valid data not containing certificate")
+	_, err = keys_and_cert.GetSigningPublicKey()
+	assert.Nil(err, "keys_and_cert.GetSigningPublicKey() returned error with valid data not containing certificate")
+	_, err = keys_and_cert.GetCertificate()
+	assert.Nil(err, "keys_and_cert.GetCertificate() returned error with valid data not containing certificate")
 }
 
-func TestNewKeysAndCertWithValidDataWithCertificateAndRemainder(t *testing.T) {
+func TestReadKeysAndCertWithValidDataWithCertificateAndRemainder(t *testing.T) {
 	assert := assert.New(t)
 
 	cert_data := make([]byte, 128+256)
 	cert_data = append(cert_data, []byte{0x05, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x41}...)
-	_, remainder, err := ReadKeysAndCert(cert_data)
+	keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
 	if assert.Equal(1, len(remainder)) {
 		assert.Equal("A", string(remainder[0]))
 	}
 	assert.Nil(err)
+
+	_, err = keys_and_cert.GetPublicKey()
+	assert.Nil(err, "keys_and_cert.GetPublicKey() returned error with valid data containing certificate")
+	_, err = keys_and_cert.GetSigningPublicKey()
+	assert.Nil(err, "keys_and_cert.GetSigningPublicKey() returned error with valid data containing certificate")
+	_, err = keys_and_cert.GetCertificate()
+	assert.Nil(err, "keys_and_cert.GetCertificate() returned error with valid data containing certificate")
 }
 
-func TestNewKeysAndCertWithValidDataWithoutCertificateAndRemainder(t *testing.T) {
+func TestReadKeysAndCertWithValidDataWithoutCertificateAndRemainder(t *testing.T) {
 	assert := assert.New(t)
 
 	cert_data := make([]byte, 128+256)
 	cert_data = append(cert_data, []byte{0x00, 0x00, 0x00, 0x41}...)
-	_, remainder, err := ReadKeysAndCert(cert_data)
+	keys_and_cert, remainder, err := ReadKeysAndCert(cert_data)
 	if assert.Equal(1, len(remainder)) {
 		assert.Equal("A", string(remainder[0]))
 	}
 	assert.Nil(err)
+
+	_, err = keys_and_cert.GetPublicKey()
+	assert.Nil(err, "keys_and_cert.GetPublicKey() returned error with valid data not containing certificate")
+	_, err = keys_and_cert.GetSigningPublicKey()
+	assert.Nil(err, "keys_and_cert.GetSigningPublicKey() returned error with valid data not containing certificate")
+	_, err = keys_and_cert.GetCertificate()
+	assert.Nil(err, "keys_and_cert.GetCertificate() returned error with valid data not containing certificate")
 }

lib/common/lease.go

@@ -0,0 +1,108 @@
+package common
+
+import (
+	"errors"
+	log "github.com/sirupsen/logrus"
+)
+
+/*
+I2P Lease
+https://geti2p.net/spec/common-structures#lease
+Accurate for version 0.9.24
+
++----+----+----+----+----+----+----+----+
+| tunnel_gw                             |
++                                       +
+|                                       |
++                                       +
+|                                       |
++                                       +
+|                                       |
++----+----+----+----+----+----+----+----+
+|     tunnel_id     |      end_date
++----+----+----+----+----+----+----+----+
+                    |
++----+----+----+----+
+
+tunnel_gw :: Hash of the RouterIdentity of the tunnel gateway
+             length -> 32 bytes
+
+tunnel_id :: TunnelId
+             length -> 4 bytes
+
+end_date :: Date
+            length -> 8 bytes
+*/
+
+// Sizes or various components of a Lease
+const (
+	LEASE_SIZE             = 44
+	LEASE_HASH_SIZE        = 32
+	LEASE_TUNNEL_ID_SIZE   = 4
+	LEASE_TUNNEL_DATE_SIZE = 8
+)
+
+type LeaseInterface interface {
+	TunnelGateway() (hash Hash)
+	TunnelID() uint32
+	Date() (date Date)
+}
+
+type Lease struct {
+	LeaseHash   Hash
+	TunnelIdent *Integer
+	TunnelDate  Date
+} //[LEASE_SIZE]byte
+
+var li LeaseInterface = &Lease{}
+
+//
+// Return the first 32 bytes of the Lease as a Hash.
+//
+func (lease Lease) TunnelGateway() (hash Hash) {
+	copy(hash[:], lease.LeaseHash[:])
+	return
+}
+
+//
+// Return the TunnelID Integer in the Lease.
+//
+func (lease Lease) TunnelID() uint32 {
+	return uint32(lease.TunnelIdent.Value())
+}
+
+//
+// Return the Date inside the Lease.
+//
+func (lease Lease) Date() (date Date) {
+	copy(date[:], lease.TunnelDate[:])
+	return
+}
+
+//
+// Possibly temporary? Just to make it compile for now
+//
+func (lease Lease) Bytes() (bytes []byte) {
+	var r []byte
+	r = append(r, lease.LeaseHash[:]...)
+	r = append(r, lease.TunnelIdent.Bytes()...)
+	r = append(r, lease.TunnelDate[:]...)
+	return r
+}
+
+func ReadLease(data []byte) (lease Lease, remainder []byte, err error) {
+	if len(data) < LEASE_SIZE {
+		log.WithFields(log.Fields{
+			"at":           "(Lease) ReadLease",
+			"data_len":     len(data),
+			"required_len": "44",
+			"reason":       "lease missing data",
+		}).Error("error parsnig lease")
+		err = errors.New("error parsing lease: lease missing data")
+	}
+	lease.LeaseHash, remainder, err = ReadHash(data)
+	identbytes, remainder, err := ReadIdent(remainder)
+	lease.TunnelIdent, err = NewInteger(identbytes[:])
+	lease.TunnelDate, remainder, err = ReadDate(remainder)
+	return
+}

lib/common/lease/doc.md

@@ -1,63 +0,0 @@
-# lease
---
-    import "github.com/go-i2p/go-i2p/lib/common/lease"
-
-Package lease implements the I2P lease common data structure
-
-## Usage
-
-```go
-const (
-	LEASE_SIZE           = 44
-	LEASE_HASH_SIZE      = 32
-	LEASE_TUNNEL_ID_SIZE = 4
-)
-```
-Sizes in bytes of various components of a Lease
-
-#### type Lease
-
-```go
-type Lease [LEASE_SIZE]byte
-```
-
-Lease is the represenation of an I2P Lease.
-
-https://geti2p.net/spec/common-structures#lease
-
-#### func  NewLease
-
-```go
-func NewLease(data []byte) (lease *Lease, remainder []byte, err error)
-```
-NewLease creates a new *NewLease from []byte using ReadLease. Returns a pointer
-to KeysAndCert unlike ReadLease.
-
-#### func  ReadLease
-
-```go
-func ReadLease(data []byte) (lease Lease, remainder []byte, err error)
-```
-ReadLease returns Lease from a []byte. The remaining bytes after the specified
-length are also returned. Returns a list of errors that occurred during parsing.
-
-#### func (Lease) Date
-
-```go
-func (lease Lease) Date() (date Date)
-```
-Date returns the date as an I2P Date.
-
-#### func (Lease) TunnelGateway
-
-```go
-func (lease Lease) TunnelGateway() (hash Hash)
-```
-TunnelGateway returns the tunnel gateway as a Hash.
-
-#### func (Lease) TunnelID
-
-```go
-func (lease Lease) TunnelID() uint32
-```
-TunnelID returns the tunnel id as a uint23.

lib/common/lease/lease.go

@@ -1,85 +0,0 @@
-// Package lease implements the I2P lease common data structure
-package lease
-
-import . "github.com/go-i2p/go-i2p/lib/common/data"
-
-// Sizes in bytes of various components of a Lease
-const (
-	LEASE_SIZE           = 44
-	LEASE_HASH_SIZE      = 32
-	LEASE_TUNNEL_ID_SIZE = 4
-)
-
-/*
-[Lease]
-Accurate for version 0.9.49
-
-Description
-Defines the authorization for a particular tunnel to receive messages targeting a Destination.
-
-Contents
-SHA256 Hash of the RouterIdentity of the gateway router, then the TunnelId and finally an end Date.
-
-+----+----+----+----+----+----+----+----+
-| tunnel_gw                             |
-+                                       +
-|                                       |
-+                                       +
-|                                       |
-+                                       +
-|                                       |
-+----+----+----+----+----+----+----+----+
-|     tunnel_id     |      end_date
-+----+----+----+----+----+----+----+----+
-                    |
-+----+----+----+----+
-
-tunnel_gw :: Hash of the RouterIdentity of the tunnel gateway
-             length -> 32 bytes
-
-tunnel_id :: TunnelId
-             length -> 4 bytes
-
-end_date :: Date
-            length -> 8 bytes
-*/
-
-// Lease is the represenation of an I2P Lease.
-//
-// https://geti2p.net/spec/common-structures#lease
-type Lease [LEASE_SIZE]byte
-
-// TunnelGateway returns the tunnel gateway as a Hash.
-func (lease Lease) TunnelGateway() (hash Hash) {
-	copy(hash[:], lease[:LEASE_HASH_SIZE])
-	return
-}
-
-// TunnelID returns the tunnel id as a uint23.
-func (lease Lease) TunnelID() uint32 {
-	i := Integer(lease[LEASE_HASH_SIZE : LEASE_HASH_SIZE+LEASE_TUNNEL_ID_SIZE])
-	return uint32(
-		i.Int(),
-	)
-}
-
-// Date returns the date as an I2P Date.
-func (lease Lease) Date() (date Date) {
-	copy(date[:], lease[LEASE_HASH_SIZE+LEASE_TUNNEL_ID_SIZE:])
-	return
-}
-
-// ReadLease returns Lease from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadLease(data []byte) (lease Lease, remainder []byte, err error) {
-	// TODO: stub
-	return
-}
-
-// NewLease creates a new *NewLease from []byte using ReadLease.
-// Returns a pointer to KeysAndCert unlike ReadLease.
-func NewLease(data []byte) (lease *Lease, remainder []byte, err error) {
-	// TODO: stub
-	return
-}

lib/common/lease2.go

@@ -0,0 +1,40 @@
+package common
+
+/*
+Lease2
+https://geti2p.net/spec/common-structures#lease2
+Description
+
+Defines the authorization for a particular tunnel to receive messages targeting a Destination. Same as Lease but with a 4-byte end_date. Used by LeaseSet2. Supported as of 0.9.38; see proposal 123 for more information.
+Contents
+
+SHA256 Hash of the RouterIdentity of the gateway router, then the TunnelId, and finally a 4 byte end date.
+
++----+----+----+----+----+----+----+----+
+| tunnel_gw                             |
++                                       +
+|                                       |
++                                       +
+|                                       |
++                                       +
+|                                       |
++----+----+----+----+----+----+----+----+
+|     tunnel_id     |      end_date     |
++----+----+----+----+----+----+----+----+
+
+tunnel_gw :: Hash of the RouterIdentity of the tunnel gateway
+             length -> 32 bytes
+
+tunnel_id :: TunnelId
+             length -> 4 bytes
+
+end_date :: 4 byte date
+            length -> 4 bytes
+            Seconds since the epoch, rolls over in 2106.
+
+Notes
+
+    Total size: 40 bytes
+
+JavaDoc: http://echelon.i2p/javadoc/net/i2p/data/Lease2.html
+*/

lib/common/lease_set.go

@@ -0,0 +1,336 @@
+package common
+
+/*
+I2P LeaseSet
+https://geti2p.net/spec/common-structures#leaseset
+Accurate for version 0.9.24
+
++----+----+----+----+----+----+----+----+
+| destination                           |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| encryption_key                        |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| signing_key                           |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+|num | Lease 0                          |
++----+                                  +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| Lease 1                               |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| Lease ($num-1)                        |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| signature                             |
++                                       +
+|                                       |
++                                       +
+|                                       |
++                                       +
+|                                       |
++                                       +
+|                                       |
++----+----+----+----+----+----+----+----+
+
+destination :: Destination
+               length -> >= 387 bytes
+
+encryption_key :: PublicKey
+                  length -> 256 bytes
+
+signing_key :: SigningPublicKey
+               length -> 128 bytes or as specified in destination's key certificate
+
+num :: Integer
+       length -> 1 byte
+       Number of leases to follow
+       value: 0 <= num <= 16
+
+leases :: [Lease]
+          length -> $num*44 bytes
+
+signature :: Signature
+             length -> 40 bytes or as specified in destination's key certificate
+*/
+
+import (
+	"errors"
+	"github.com/go-i2p/go-i2p/lib/crypto"
+	log "github.com/sirupsen/logrus"
+)
+
+// Sizes of various structures in an I2P LeaseSet
+const (
+	LEASE_SET_PUBKEY_SIZE = 256
+	LEASE_SET_SPK_SIZE    = 128
+	LEASE_SET_SIG_SIZE    = 40
+)
+
+type LeaseSetInterface interface {
+	GetPublicKey() (public_key crypto.ElgPublicKey, err error)
+	GetSigningKey() (signing_public_key crypto.SigningPublicKey, err error)
+	Leases() (leases []Lease, err error)
+	/*	LeaseCount() (count int, err error)*/
+
+	GetSignature() (signature Signature, err error)
+	/*	Verify() error
+		NewestExpiration() (oldest Date, err error)
+		OldestExpiration() (earliest Date, err error)*/
+}
+
+type LeaseSet struct {
+	Destination
+	crypto.SigningPublicKey
+	crypto.ElgPublicKey
+	LeaseList []Lease
+}
+
+var lsi LeaseSetInterface = &LeaseSet{}
+
+//
+// Read a Destination from the LeaseSet.
+//
+func (lease_set LeaseSet) GetDestination() (destination Destination, err error) {
+	if &lease_set.Destination != nil {
+		destination = lease_set.Destination
+	} else {
+		err = errors.New("Error leaseset does not contain a destination")
+	}
+	return
+}
+
+//
+// Return the PublicKey in this LeaseSet and any errors ancountered parsing the LeaseSet.
+//
+func (lease_set LeaseSet) GetPublicKey() (public_key crypto.ElgPublicKey, err error) {
+	public_key = lease_set.ElgPublicKey
+	return
+}
+
+//
+// Return the SigningPublicKey, as specified in the LeaseSet's Destination's Key Certificate if
+// present, or a legacy DSA key.
+//
+func (lease_set LeaseSet) GetSigningKey() (signing_public_key crypto.SigningPublicKey, err error) {
+	if lease_set.SigningPublicKey == nil {
+		log.WithFields(log.Fields{
+			"at":     "(LeaseSet) SigningKey",
+			"public": lease_set.SigningPublicKey,
+			"reason": "not enough data",
+		}).Error("error parsing signing public key")
+		err = errors.New("error parsing signing public key: not enough data")
+		return
+	}
+	signing_public_key = lease_set.SigningPublicKey
+	return
+}
+
+func (lease_set LeaseSet) Leases() (leases []Lease, err error) {
+	leases = lease_set.LeaseList
+	return
+}
+
+//
+// Return the number of Leases specified by the LeaseCount value in this LeaseSet.
+//
+func (lease_set LeaseSet) LeaseCount() (count int, err error) {
+	count = len(lease_set.LeaseList)
+	return
+}
+
+//
+// Return the Signature data for the LeaseSet, as specified in the Destination's
+// Key Certificate if present or the 40 bytes following the Leases.
+//
+func (lease_set LeaseSet) GetSignature() (signature Signature, err error) {
+	return
+}
+
+//
+//
+//
+/*
+func (lease_set LeaseSet) Verify() error {
+	//data_end := len(destination) +
+	//	LEASE_SET_PUBKEY_SIZE +
+	//	LEASE_SET_SPK_SIZE +
+	//	1 +
+	//	(44 * lease_set.LeaseCount())
+	//data := lease_set[:data_end]
+	//spk, _ := lease_set.
+	//	Destination().
+	//	SigningPublicKey()
+	//verifier, err := spk.NewVerifier()
+	//if err != nil {
+	//	return err
+	//}
+	return nil // verifier.Verify(data, lease_set.Signature())
+}
+*/
+//
+// Return the oldest date from all the Leases in the LeaseSet.
+//
+func (lease_set LeaseSet) NewestExpiration() (oldest Date, err error) {
+	leases, err := lease_set.Leases()
+	if err != nil {
+		return
+	}
+	oldest = Date{0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+	for _, lease := range leases {
+		date := lease.Date()
+		if date.Time().After(oldest.Time()) {
+			oldest = date
+		}
+	}
+	return
+}
+
+//
+// Return the oldest date from all the Leases in the LeaseSet.
+//
+func (lease_set LeaseSet) OldestExpiration() (earliest Date, err error) {
+	leases, err := lease_set.Leases()
+	if err != nil {
+		return
+	}
+	earliest = Date{0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
+	for _, lease := range leases {
+		date := lease.Date()
+		if date.Time().Before(earliest.Time()) {
+			earliest = date
+		}
+	}
+	return
+}
+
+func ReadLeaseSetSignature(bytes []byte, cert CertificateInterface) (signature Signature, remainder []byte, err error) {
+	start := 0
+	cert_type, _, _ := cert.Type()
+	var end int
+	if cert_type == CERT_KEY {
+		end = start + cert.SignatureSize()
+	} else {
+		end = start + LEASE_SET_SIG_SIZE
+	}
+	bytes_len := len(bytes)
+	if bytes_len < end {
+		log.WithFields(log.Fields{
+			"at":           "(LeaseSet) Signature",
+			"data_len":     bytes_len,
+			"required_len": end,
+			"reason":       "not enough data",
+		}).Error("error parsing signatre")
+		err = errors.New("error parsing signature: not enough data")
+		signature = []byte(bytes[start:bytes_len])
+		return
+	}
+	signature = []byte(bytes[start:end])
+	return
+}
+
+func ReadLeaseCount(bytes []byte) (count *Integer, err error) {
+	remainder_len := len(bytes)
+	if remainder_len < LEASE_SET_PUBKEY_SIZE+LEASE_SET_SPK_SIZE+1 {
+		log.WithFields(log.Fields{
+			"at":           "(LeaseSet) LeaseCount",
+			"data_len":     remainder_len,
+			"required_len": LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1,
+			"reason":       "not enough data",
+		}).Error("error parsing lease count")
+		err = errors.New("error parsing lease count: not enough data")
+		return
+	}
+	count, err = NewInteger([]byte{bytes[LEASE_SET_PUBKEY_SIZE+LEASE_SET_SPK_SIZE]})
+	if count.Value() > 16 {
+		log.WithFields(log.Fields{
+			"at":          "(LeaseSet) LeaseCount",
+			"lease_count": count,
+			"reason":      "more than 16 leases",
+		}).Warn("invalid lease set")
+		err = errors.New("invalid lease set: more than 16 leases")
+	}
+	return
+}
+
+//
+// Read the Leases in this LeaseSet, returning a partial set if there is insufficient data.
+//
+func ReadLeases(bytes []byte) (leases []Lease, remainder []byte, err error) {
+	count, err := ReadLeaseCount(bytes)
+	if err != nil {
+		return
+	}
+	for i := 0; i < count.Value(); i++ {
+		start := 0 //offset + (i * LEASE_SIZE)
+		end := start + LEASE_SIZE
+		lease_set_len := len(bytes)
+		if lease_set_len < end {
+			log.WithFields(log.Fields{
+				"at":           "(LeaseSet) Leases",
+				"data_len":     lease_set_len,
+				"required_len": end,
+				"reason":       "some leases missing",
+			}).Error("error parsnig lease set")
+			err = errors.New("error parsing lease set: some leases missing")
+			return
+		}
+		var lease Lease
+		lease, remainder, err = ReadLease(bytes[start:end])
+		leases = append(leases, lease)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
+func ReadLeaseSetKeys(data []byte, cert CertificateInterface) (spk crypto.SigningPublicKey, pk crypto.ElgPublicKey, remainder []byte, err error) {
+	spk, ppk, remainder, err := ReadKeys(data, cert)
+	switch ppk.(type) {
+	case crypto.ElgPublicKey:
+		pk = ppk.(crypto.ElgPublicKey)
+	default:
+		err = errors.New("LeaseSet1 uses Elgamal public keys.")
+	}
+	return
+}
+
+func ReadLeaseSet(data []byte) (lease_set LeaseSet, remainder []byte, err error) {
+	destination, remainder, err := ReadDestination(data)
+	lease_set.Destination = destination
+	//offset := len(destination.Bytes()) + LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1
+	spk, pk, remainder, err := ReadLeaseSetKeys(remainder, nil)
+	lease_set.SigningPublicKey = spk
+	lease_set.ElgPublicKey = pk
+	leases, remainder, err := ReadLeases(data)
+	lease_set.LeaseList = leases
+
+	return
+}

lib/common/lease_set/doc.md

@@ -1,95 +0,0 @@
-# lease_set
---
-    import "github.com/go-i2p/go-i2p/lib/common/lease_set"
-
-Package lease_set implements the I2P LeastSet common data structure
-
-## Usage
-
-```go
-const (
-	LEASE_SET_PUBKEY_SIZE = 256
-	LEASE_SET_SPK_SIZE    = 128
-	LEASE_SET_SIG_SIZE    = 40
-)
-```
-Sizes of various structures in an I2P LeaseSet
-
-#### type LeaseSet
-
-```go
-type LeaseSet []byte
-```
-
-LeaseSet is the represenation of an I2P LeaseSet.
-
-https://geti2p.net/spec/common-structures#leaseset
-
-#### func (LeaseSet) Destination
-
-```go
-func (lease_set LeaseSet) Destination() (destination Destination, err error)
-```
-Destination returns the Destination as []byte.
-
-#### func (LeaseSet) LeaseCount
-
-```go
-func (lease_set LeaseSet) LeaseCount() (count int, err error)
-```
-LeaseCount returns the numbert of leases specified by the LeaseCount value as
-int. returns errors encountered during parsing.
-
-#### func (LeaseSet) Leases
-
-```go
-func (lease_set LeaseSet) Leases() (leases []Lease, err error)
-```
-Leases returns the leases as []Lease. returns errors encountered during parsing.
-
-#### func (LeaseSet) NewestExpiration
-
-```go
-func (lease_set LeaseSet) NewestExpiration() (newest Date, err error)
-```
-NewestExpiration returns the newest lease expiration as an I2P Date. Returns
-errors encountered during parsing.
-
-#### func (LeaseSet) OldestExpiration
-
-```go
-func (lease_set LeaseSet) OldestExpiration() (earliest Date, err error)
-```
-OldestExpiration returns the oldest lease expiration as an I2P Date. Returns
-errors encountered during parsing.
-
-#### func (LeaseSet) PublicKey
-
-```go
-func (lease_set LeaseSet) PublicKey() (public_key crypto.ElgPublicKey, err error)
-```
-PublicKey returns the public key as crypto.ElgPublicKey. Returns errors
-encountered during parsing.
-
-#### func (LeaseSet) Signature
-
-```go
-func (lease_set LeaseSet) Signature() (signature Signature, err error)
-```
-Signature returns the signature as Signature. returns errors encountered during
-parsing.
-
-#### func (LeaseSet) SigningKey
-
-```go
-func (lease_set LeaseSet) SigningKey() (signing_public_key crypto.SigningPublicKey, err error)
-```
-SigningKey returns the signing public key as crypto.SigningPublicKey. returns
-errors encountered during parsing.
-
-#### func (LeaseSet) Verify
-
-```go
-func (lease_set LeaseSet) Verify() error
-```
-Verify returns nil

lib/common/lease_set/lease_set.go

@@ -1,368 +0,0 @@
-// Package lease_set implements the I2P LeastSet common data structure
-package lease_set
-
-import (
-	"errors"
-
-	. "github.com/go-i2p/go-i2p/lib/common/certificate"
-	. "github.com/go-i2p/go-i2p/lib/common/data"
-	. "github.com/go-i2p/go-i2p/lib/common/destination"
-	. "github.com/go-i2p/go-i2p/lib/common/key_certificate"
-	. "github.com/go-i2p/go-i2p/lib/common/keys_and_cert"
-	. "github.com/go-i2p/go-i2p/lib/common/lease"
-	. "github.com/go-i2p/go-i2p/lib/common/signature"
-	"github.com/go-i2p/go-i2p/lib/crypto"
-	log "github.com/sirupsen/logrus"
-)
-
-// Sizes of various structures in an I2P LeaseSet
-const (
-	LEASE_SET_PUBKEY_SIZE = 256
-	LEASE_SET_SPK_SIZE    = 128
-	LEASE_SET_SIG_SIZE    = 40
-)
-
-/*
-[LeaseSet]
-Accurate for version 0.9.49
-
-Description
-Contains all of the currently authorized Leases for a particular Destination, the
-PublicKey to which garlic messages can be encrypted, and then the SigningPublicKey
-that can be used to revoke this particular version of the structure. The LeaseSet is one
-of the two structures stored in the network database (the other being RouterInfo), and
-is kered under the SHA256 of the contained Destination.
-
-Contents
-Destination, followed by a PublicKey for encryption, then a SigningPublicKey which
-can be used to revoke this version of the LeaseSet, then a 1 byte Integer specifying how
-many Lease structures are in the set, followed by the actual Lease structures and
-finally a Signature of the previous bytes signed by the Destination's SigningPrivateKey.
-
-+----+----+----+----+----+----+----+----+
-| destination                           |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| encryption_key                        |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| signing_key                           |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-|num | Lease 0                          |
-+----+                                  +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| Lease 1                               |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| Lease ($num-1)                        |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| signature                             |
-+                                       +
-|                                       |
-+                                       +
-|                                       |
-+                                       +
-|                                       |
-+                                       +
-|                                       |
-+----+----+----+----+----+----+----+----+
-
-destination :: Destination
-               length -> >= 387 bytes
-
-encryption_key :: PublicKey
-                  length -> 256 bytes
-
-signing_key :: SigningPublicKey
-               length -> 128 bytes or as specified in destination's key certificate
-
-num :: Integer
-       length -> 1 byte
-       Number of leases to follow
-       value: 0 <= num <= 16
-
-leases :: [Lease]
-          length -> $num*44 bytes
-
-signature :: Signature
-             length -> 40 bytes or as specified in destination's key certificate
-*/
-
-// LeaseSet is the represenation of an I2P LeaseSet.
-//
-// https://geti2p.net/spec/common-structures#leaseset
-type LeaseSet []byte
-
-/*
-type LeaseSet struct {
-	Destination *Destination
-	EncryptionKey *crypto.ElgPublicKey
-	SigningKey *crypto.ElgPublicKey
-	Size *Integer
-	Leases []*Lease
-	Signature *Signature
-}
-*/
-
-// Destination returns the Destination as []byte.
-func (lease_set LeaseSet) Destination() (destination Destination, err error) {
-	keys_and_cert, _, err := ReadKeysAndCert(lease_set)
-	if err != nil {
-		return
-	}
-	destination, _, err = ReadDestination(keys_and_cert.Bytes())
-	return
-}
-
-// PublicKey returns the public key as crypto.ElgPublicKey.
-// Returns errors encountered during parsing.
-func (lease_set LeaseSet) PublicKey() (public_key crypto.ElgPublicKey, err error) {
-	_, remainder, err := ReadKeysAndCert(lease_set)
-	remainder_len := len(remainder)
-	if remainder_len < LEASE_SET_PUBKEY_SIZE {
-		log.WithFields(log.Fields{
-			"at":           "(LeaseSet) PublicKey",
-			"data_len":     remainder_len,
-			"required_len": LEASE_SET_PUBKEY_SIZE,
-			"reason":       "not enough data",
-		}).Error("error parsing public key")
-		err = errors.New("error parsing public key: not enough data")
-		copy(public_key[:], remainder)
-		return
-	}
-	copy(public_key[:], remainder[:LEASE_SET_PUBKEY_SIZE])
-	return
-}
-
-// SigningKey returns the signing public key as crypto.SigningPublicKey.
-// returns errors encountered during parsing.
-func (lease_set LeaseSet) SigningKey() (signing_public_key crypto.SigningPublicKey, err error) {
-	destination, err := lease_set.Destination()
-	if err != nil {
-		return
-	}
-	offset := len(destination.Bytes()) + LEASE_SET_PUBKEY_SIZE
-	cert := destination.Certificate()
-	cert_len := cert.Length()
-	if err != nil {
-		return
-	}
-	lease_set_len := len(lease_set)
-	if lease_set_len < offset+LEASE_SET_SPK_SIZE {
-		log.WithFields(log.Fields{
-			"at":           "(LeaseSet) SigningKey",
-			"data_len":     lease_set_len,
-			"required_len": offset + LEASE_SET_SPK_SIZE,
-			"reason":       "not enough data",
-		}).Error("error parsing signing public key")
-		err = errors.New("error parsing signing public key: not enough data")
-		return
-	}
-	if cert_len == 0 {
-		// No Certificate is present, return the LEASE_SET_SPK_SIZE byte
-		// SigningPublicKey space as legacy DSA SHA1 SigningPublicKey.
-		var dsa_pk crypto.DSAPublicKey
-		copy(dsa_pk[:], lease_set[offset:offset+LEASE_SET_SPK_SIZE])
-		signing_public_key = dsa_pk
-	} else {
-		// A Certificate is present in this LeaseSet's Destination
-		cert_type := cert.Type()
-		if cert_type == CERT_KEY {
-			// This LeaseSet's Destination's Certificate is a Key Certificate,
-			// create the signing publickey key using any data that might be
-			// contained in the key certificate.
-			signing_public_key, err = KeyCertificateFromCertificate(cert).ConstructSigningPublicKey(
-				lease_set[offset : offset+LEASE_SET_SPK_SIZE],
-			)
-		} else {
-			// No Certificate is present, return the LEASE_SET_SPK_SIZE byte
-			// SigningPublicKey space as legacy DSA SHA1 SigningPublicKey.
-			var dsa_pk crypto.DSAPublicKey
-			copy(dsa_pk[:], lease_set[offset:offset+LEASE_SET_SPK_SIZE])
-			signing_public_key = dsa_pk
-		}
-
-	}
-	return
-}
-
-// LeaseCount returns the numbert of leases specified by the LeaseCount value as int.
-// returns errors encountered during parsing.
-func (lease_set LeaseSet) LeaseCount() (count int, err error) {
-	_, remainder, err := ReadKeysAndCert(lease_set)
-	if err != nil {
-		return
-	}
-	remainder_len := len(remainder)
-	if remainder_len < LEASE_SET_PUBKEY_SIZE+LEASE_SET_SPK_SIZE+1 {
-		log.WithFields(log.Fields{
-			"at":           "(LeaseSet) LeaseCount",
-			"data_len":     remainder_len,
-			"required_len": LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1,
-			"reason":       "not enough data",
-		}).Error("error parsing lease count")
-		err = errors.New("error parsing lease count: not enough data")
-		return
-	}
-	c := Integer([]byte{remainder[LEASE_SET_PUBKEY_SIZE+LEASE_SET_SPK_SIZE]})
-	count = c.Int()
-	if count > 16 {
-		log.WithFields(log.Fields{
-			"at":          "(LeaseSet) LeaseCount",
-			"lease_count": count,
-			"reason":      "more than 16 leases",
-		}).Warn("invalid lease set")
-		err = errors.New("invalid lease set: more than 16 leases")
-	}
-	return
-}
-
-// Leases returns the leases as []Lease.
-// returns errors encountered during parsing.
-func (lease_set LeaseSet) Leases() (leases []Lease, err error) {
-	destination, err := lease_set.Destination()
-	if err != nil {
-		return
-	}
-	offset := len(destination.Bytes()) + LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1
-	count, err := lease_set.LeaseCount()
-	if err != nil {
-		return
-	}
-	for i := 0; i < count; i++ {
-		start := offset + (i * LEASE_SIZE)
-		end := start + LEASE_SIZE
-		lease_set_len := len(lease_set)
-		if lease_set_len < end {
-			log.WithFields(log.Fields{
-				"at":           "(LeaseSet) Leases",
-				"data_len":     lease_set_len,
-				"required_len": end,
-				"reason":       "some leases missing",
-			}).Error("error parsnig lease set")
-			err = errors.New("error parsing lease set: some leases missing")
-			return
-		}
-		var lease Lease
-		copy(lease[:], lease_set[start:end])
-		leases = append(leases, lease)
-	}
-	return
-}
-
-// Signature returns the signature as Signature.
-// returns errors encountered during parsing.
-func (lease_set LeaseSet) Signature() (signature Signature, err error) {
-	destination, err := lease_set.Destination()
-	if err != nil {
-		return
-	}
-	lease_count, err := lease_set.LeaseCount()
-	if err != nil {
-		return
-	}
-	start := len(destination.Bytes()) +
-		LEASE_SET_PUBKEY_SIZE +
-		LEASE_SET_SPK_SIZE +
-		1 +
-		(LEASE_SIZE * lease_count)
-	cert := destination.Certificate()
-	cert_type := cert.Type()
-	var end int
-	if cert_type == CERT_KEY {
-		end = start + KeyCertificateFromCertificate(cert).SignatureSize()
-	} else {
-		end = start + LEASE_SET_SIG_SIZE
-	}
-	lease_set_len := len(lease_set)
-	if lease_set_len < end {
-		log.WithFields(log.Fields{
-			"at":           "(LeaseSet) Signature",
-			"data_len":     lease_set_len,
-			"required_len": end,
-			"reason":       "not enough data",
-		}).Error("error parsing signatre")
-		err = errors.New("error parsing signature: not enough data")
-		return
-	}
-	signature = []byte(lease_set[start:end])
-	return
-}
-
-// Verify returns nil
-func (lease_set LeaseSet) Verify() error {
-	//data_end := len(destination) +
-	//	LEASE_SET_PUBKEY_SIZE +
-	//	LEASE_SET_SPK_SIZE +
-	//	1 +
-	//	(44 * lease_set.LeaseCount())
-	//data := lease_set[:data_end]
-	//spk, _ := lease_set.
-	//	Destination().
-	//	SigningPublicKey()
-	//verifier, err := spk.NewVerifier()
-	//if err != nil {
-	//	return err
-	//}
-	return nil // verifier.Verify(data, lease_set.Signature())
-}
-
-// NewestExpiration returns the newest lease expiration as an I2P Date.
-// Returns errors encountered during parsing.
-func (lease_set LeaseSet) NewestExpiration() (newest Date, err error) {
-	leases, err := lease_set.Leases()
-	if err != nil {
-		return
-	}
-	newest = Date{0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-	for _, lease := range leases {
-		date := lease.Date()
-		if date.Time().After(newest.Time()) {
-			newest = date
-		}
-	}
-	return
-}
-
-// OldestExpiration returns the oldest lease expiration as an I2P Date.
-// Returns errors encountered during parsing.
-func (lease_set LeaseSet) OldestExpiration() (earliest Date, err error) {
-	leases, err := lease_set.Leases()
-	if err != nil {
-		return
-	}
-	earliest = Date{0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
-	for _, lease := range leases {
-		date := lease.Date()
-		if date.Time().Before(earliest.Time()) {
-			earliest = date
-		}
-	}
-	return
-}

lib/common/lease_set_2.go

@@ -0,0 +1,105 @@
+package common
+
+/*
+
+https://geti2p.net/spec/common-structures#leaseset2
+LeaseSet2
+Description
+
+Contained in a I2NP DatabaseStore message of type 3. Supported as of 0.9.38; see proposal 123 for more information.
+
+Contains all of the currently authorized Lease2 for a particular Destination, and the PublicKey to which garlic messages can be encrypted. A LeaseSet is one of the two structures stored in the network database (the other being RouterInfo), and is keyed under the SHA256 of the contained Destination.
+Contents
+
+LeaseSet2Header, followed by a options, then one or more PublicKey for encryption, Integer specifying how many Lease2 structures are in the set, followed by the actual Lease2 structures and finally a Signature of the previous bytes signed by the Destination's SigningPrivateKey or the transient key.
+
++----+----+----+----+----+----+----+----+
+|         ls2_header                    |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+|          options                      |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+|numk| keytype0| keylen0 |              |
++----+----+----+----+----+              +
+|          encryption_key_0             |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| keytypen| keylenn |                   |
++----+----+----+----+                   +
+|          encryption_key_n             |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| num| Lease2 0                         |
++----+                                  +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| Lease2($num-1)                        |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| signature                             |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+
+ls2header :: LeaseSet2Header
+             length -> varies
+
+options :: Mapping
+           length -> varies, 2 bytes minimum
+
+numk :: Integer
+        length -> 1 byte
+        Number of key types, key lengths, and PublicKeys to follow
+        value: 1 <= numk <= max TBD
+
+keytype :: The encryption type of the PublicKey to follow.
+           length -> 2 bytes
+
+keylen :: The length of the PublicKey to follow.
+          Must match the specified length of the encryption type.
+          length -> 2 bytes
+
+encryption_key :: PublicKey
+                  length -> 256 bytes
+
+num :: Integer
+       length -> 1 byte
+       Number of Lease2s to follow
+       value: 0 <= num <= 16
+
+leases :: [Lease2]
+          length -> $num*40 bytes
+
+signature :: Signature
+             length -> 40 bytes or as specified in destination's key
+                       certificate, or by the sigtype of the transient public key,
+                       if present in the header
+
+Notes
+
+    The public key of the destination was used for the old I2CP-to-I2CP encryption which was disabled in version 0.6, it is currently unused.
+    The encryption keys are used for end-to-end ElGamal/AES+SessionTag encryption [ELGAMAL-AES] (type 0) or other end-to-end encryption schemes. See [ECIES] and proposals 145 and 156. They may be generated anew at every router startup or they may be persistent. X25519 (type 4, see [ECIES]) is supported as of release 0.9.44.
+    The signature is over the data above, PREPENDED with the single byte containing the DatabaseStore type (3).
+    The signature may be verified using the signing public key of the destination, or the transient signing public key, if an offline signature is included in the leaseset2 header.
+    The key length is provided for each key, so that floodfills and clients may parse the structure even if not all encryption types are known or supported.
+
+JavaDoc: http://echelon.i2p/javadoc/net/i2p/data/LeaseSet2.html
+
+*/

lib/common/lease_set_test.go

@@ -1,22 +1,16 @@
-package lease_set
+package common
 
 import (
 	"bytes"
-	"testing"
-
-	"github.com/go-i2p/go-i2p/lib/common/certificate"
-	common "github.com/go-i2p/go-i2p/lib/common/data"
-	"github.com/go-i2p/go-i2p/lib/common/lease"
-	"github.com/go-i2p/go-i2p/lib/common/router_identity"
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
-func buildDestination() *router_identity.RouterIdentity {
+func buildDestination() RouterIdentity {
 	router_ident_data := make([]byte, 128+256)
 	router_ident_data = append(router_ident_data, []byte{0x05, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00}...)
-	ident, _, err := router_identity.ReadRouterIdentity(router_ident_data)
-	panic(err)
-	return &ident
+	rri, _, _ := ReadRouterIdentity(router_ident_data)
+	return rri
 }
 
 func buildPublicKey() []byte {
@@ -38,15 +32,15 @@ func buildSigningKey() []byte {
 func buildLease(n int) []byte {
 	data := make([]byte, 0)
 	for i := 0; i < n; i++ {
-		l := make([]byte, lease.LEASE_SIZE)
-		for p := range l {
-			l[p] = byte(i)
+		lease := make([]byte, LEASE_SIZE)
+		for p := range lease {
+			lease[p] = byte(i)
 		}
-		for q := lease.LEASE_SIZE - 9; q < lease.LEASE_SIZE-1; q++ {
-			l[q] = 0x00
+		for q := LEASE_SIZE - 9; q < LEASE_SIZE-1; q++ {
+			lease[q] = 0x00
 		}
-		l[lease.LEASE_SIZE-1] = byte(i + 10)
-		data = append(data, l...)
+		lease[LEASE_SIZE-1] = byte(i + 10)
+		data = append(data, lease...)
 	}
 	return data
 }
@@ -61,33 +55,34 @@ func buildSignature(size int) []byte {
 
 func buildFullLeaseSet(n int) LeaseSet {
 	lease_set_data := make([]byte, 0)
-	lease_set_data = append(lease_set_data, buildDestination().KeysAndCert.KeyCertificate.RawBytes()...)
+	lease_set_data = append(lease_set_data, buildDestination().Bytes()...)
 	lease_set_data = append(lease_set_data, buildPublicKey()...)
 	lease_set_data = append(lease_set_data, buildSigningKey()...)
 	lease_set_data = append(lease_set_data, byte(n))
 	lease_set_data = append(lease_set_data, buildLease(n)...)
 	lease_set_data = append(lease_set_data, buildSignature(64)...)
-	return LeaseSet(lease_set_data)
+	leaseSet, _, _ := ReadLeaseSet(lease_set_data)
+	return leaseSet
 }
 
 func TestDestinationIsCorrect(t *testing.T) {
 	assert := assert.New(t)
 
 	lease_set := buildFullLeaseSet(1)
-	dest, err := lease_set.Destination()
+	dest, err := lease_set.GetDestination()
 	assert.Nil(err)
-	dest_cert := dest.Certificate()
-	// assert.Nil(err)
-	cert_type := dest_cert.Type()
+	dest_cert, err := dest.Certificate()
 	assert.Nil(err)
-	assert.Equal(certificate.CERT_KEY, cert_type)
+	_, cert_bytes, err := dest_cert.Type()
+	assert.Nil(err)
+	assert.Equal(CERT_KEY, cert_bytes)
 }
 
 func TestPublicKeyIsCorrect(t *testing.T) {
 	assert := assert.New(t)
 
 	lease_set := buildFullLeaseSet(1)
-	pk, err := lease_set.PublicKey()
+	pk, err := lease_set.GetPublicKey()
 	if assert.Nil(err) {
 		assert.Equal(
 			0,
@@ -103,7 +98,7 @@ func TestSigningKeyIsCorrect(t *testing.T) {
 	assert := assert.New(t)
 
 	lease_set := buildFullLeaseSet(1)
-	sk, err := lease_set.SigningKey()
+	sk, err := lease_set.GetSigningKey()
 	if assert.Nil(err) {
 		assert.Equal(128, sk.Len())
 	}
@@ -149,19 +144,19 @@ func TestLeasesHaveCorrectData(t *testing.T) {
 		leases, err := lease_set.Leases()
 		if assert.Nil(err) {
 			for i := 0; i < count; i++ {
-				l := make([]byte, lease.LEASE_SIZE)
-				for p := range l {
-					l[p] = byte(i)
+				lease := make([]byte, LEASE_SIZE)
+				for p := range lease {
+					lease[p] = byte(i)
 				}
-				for q := lease.LEASE_SIZE - 9; q < lease.LEASE_SIZE-1; q++ {
-					l[q] = 0x00
+				for q := LEASE_SIZE - 9; q < LEASE_SIZE-1; q++ {
+					lease[q] = 0x00
 				}
-				l[lease.LEASE_SIZE-1] = byte(i + 10)
+				lease[LEASE_SIZE-1] = byte(i + 10)
 				assert.Equal(
 					0,
 					bytes.Compare(
-						l,
-						leases[i][:],
+						lease,
+						leases[i].Bytes()[:],
 					),
 				)
 			}
@@ -173,7 +168,7 @@ func TestSignatureIsCorrect(t *testing.T) {
 	assert := assert.New(t)
 
 	lease_set := buildFullLeaseSet(1)
-	sig, err := lease_set.Signature()
+	sig, err := lease_set.GetSignature()
 	if assert.Nil(err) {
 		assert.Equal(
 			0,
@@ -191,9 +186,8 @@ func TestNewestExpirationIsCorrect(t *testing.T) {
 	lease_set := buildFullLeaseSet(5)
 	latest, err := lease_set.NewestExpiration()
 	assert.Nil(err)
-	Date, _, err := common.NewDate([]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, byte(4 + 10)})
 	assert.Equal(
-		Date,
+		Date{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, byte(4 + 10)},
 		latest,
 	)
 }
@@ -204,9 +198,8 @@ func TestOldestExpirationIsCorrect(t *testing.T) {
 	lease_set := buildFullLeaseSet(5)
 	latest, err := lease_set.OldestExpiration()
 	assert.Nil(err)
-	Date, _, err := common.NewDate([]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a})
 	assert.Equal(
-		Date,
+		Date{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a},
 		latest,
 	)
 }

lib/common/mapping.go

@@ -0,0 +1,228 @@
+package common
+
+/*
+I2P Mapping
+https://geti2p.net/spec/common-structures#mapping
+Accurate for version 0.9.24
+
++----+----+----+----+----+----+----+----+
+|  size   |key_string (len + data) | =  |
++----+----+----+----+----+----+----+----+
+| val_string (len + data)     | ;  | ...
++----+----+----+----+----+----+----+
+size :: Integer
+        length -> 2 bytes
+        Total number of bytes that follow
+
+key_string :: String
+              A string (one byte length followed by UTF-8 encoded characters)
+
+= :: A single byte containing '='
+
+val_string :: String
+              A string (one byte length followed by UTF-8 encoded characters)
+
+; :: A single byte containing ';'
+*/
+
+import (
+	"encoding/binary"
+	"errors"
+	log "github.com/sirupsen/logrus"
+	"sort"
+)
+
+type Mapping []byte
+
+// Parsed key-values pairs inside a Mapping.
+type MappingValues [][2]String
+
+//
+// Returns the values contained in a Mapping in the form of a MappingValues.
+//
+func (mapping Mapping) Values() (map_values MappingValues, errs []error) {
+	var str String
+	var remainder = mapping
+	var err error
+
+	length, err := NewInteger(remainder[:2])
+	inferred_length := length.Value() + 2
+	remainder = remainder[2:]
+	mapping_len := len(mapping)
+	if mapping_len > inferred_length {
+		log.WithFields(log.Fields{
+			"at":                    "(Mapping) Values",
+			"mappnig_bytes_length":  mapping_len,
+			"mapping_length_field":  length,
+			"expected_bytes_length": inferred_length,
+			"reason":                "data longer than expected",
+		}).Warn("mapping format warning")
+		errs = append(errs, errors.New("warning parsing mapping: data exists beyond length of mapping"))
+	} else if inferred_length > mapping_len {
+		log.WithFields(log.Fields{
+			"at":                    "(Mapping) Values",
+			"mappnig_bytes_length":  mapping_len,
+			"mapping_length_field":  length,
+			"expected_bytes_length": inferred_length,
+			"reason":                "data shorter than expected",
+		}).Warn("mapping format warning")
+		errs = append(errs, errors.New("warning parsing mapping: mapping length exceeds provided data"))
+	}
+
+	for {
+		// Read a key, breaking on fatal errors
+		// and appending warnings
+		str, remainder, err = ReadString(remainder)
+		key_str := str
+		if err != nil {
+			if stopValueRead(err) {
+				errs = append(errs, err)
+				return
+			}
+		}
+		if !beginsWith(remainder, 0x3d) {
+			log.WithFields(log.Fields{
+				"at":     "(Mapping) Values",
+				"reason": "expected =",
+			}).Warn("mapping format violation")
+			errs = append(errs, errors.New("mapping format violation, expected ="))
+			return
+		}
+		remainder = remainder[1:]
+
+		// Read a value, breaking on fatal errors
+		// and appending warnings
+		str, remainder, err = ReadString(remainder)
+		val_str := str
+		if err != nil {
+			if stopValueRead(err) {
+				errs = append(errs, err)
+				return
+			}
+		}
+		if !beginsWith(remainder, 0x3b) {
+			log.WithFields(log.Fields{
+				"at":     "(Mapping) Values",
+				"reason": "expected ;",
+			}).Warn("mapping format violation")
+			errs = append(errs, errors.New("mapping format violation, expected ;"))
+			return
+		}
+		remainder = remainder[1:]
+
+		// Append the key-value pair and break if there is no more data to read
+		map_values = append(map_values, [2]String{key_str, val_str})
+		if len(remainder) == 0 {
+			break
+		}
+	}
+	return
+}
+
+//
+// Return true if two keys in a mapping are identical.
+//
+func (mapping Mapping) HasDuplicateKeys() bool {
+	seen_values := make(map[string]bool)
+	values, _ := mapping.Values()
+	for _, pair := range values {
+		key, _ := pair[0].Data()
+		if _, present := seen_values[key]; present {
+			return true
+		} else {
+			seen_values[key] = true
+		}
+	}
+	return false
+}
+
+//
+// Convert a MappingValue struct to a Mapping.  The values are first
+// sorted in the order defined in mappingOrder.
+//
+func ValuesToMapping(values MappingValues) (mapping Mapping) {
+	mappingOrder(values)
+	for _, kv_pair := range values {
+		key_string := kv_pair[0]
+		key_string = append(key_string, []byte("=")[0])
+		key_value := kv_pair[1]
+		key_value = append(key_value, []byte(";")[0])
+		mapping = append(append(mapping, key_string...), key_value...)
+	}
+	map_len := len(mapping)
+	len_bytes := make([]byte, 2)
+	binary.BigEndian.PutUint16(len_bytes, uint16(map_len))
+	mapping = append(len_bytes, mapping...)
+	return
+}
+
+//
+// Convert a Go map of unformatted strings to a sorted Mapping.
+//
+func GoMapToMapping(gomap map[string]string) (mapping Mapping, err error) {
+	map_vals := MappingValues{}
+	for k, v := range gomap {
+		key_str, kerr := ToI2PString(k)
+		if kerr != nil {
+			err = kerr
+			return
+		}
+		val_str, verr := ToI2PString(v)
+		if verr != nil {
+			err = verr
+			return
+		}
+		map_vals = append(
+			map_vals,
+			[2]String{key_str, val_str},
+		)
+	}
+	mapping = ValuesToMapping(map_vals)
+	return
+}
+
+type byValue MappingValues
+
+func (set byValue) Len() int      { return len(set) }
+func (set byValue) Swap(i, j int) { set[i], set[j] = set[j], set[i] }
+func (set byValue) Less(i, j int) bool {
+	data1, _ := set[i][1].Data()
+	data2, _ := set[j][1].Data()
+	return data1 < data2
+}
+
+type byKey MappingValues
+
+func (set byKey) Len() int      { return len(set) }
+func (set byKey) Swap(i, j int) { set[i], set[j] = set[j], set[i] }
+func (set byKey) Less(i, j int) bool {
+	data1, _ := set[i][0].Data()
+	data2, _ := set[j][0].Data()
+	return data1 < data2
+}
+
+//
+// I2P Mappings require consistent order for for cryptographic signing, and sorting
+// by keys.  When new Mappings are created, they are stable sorted first by values
+// than by keys to ensure a consistent order.
+//
+func mappingOrder(values MappingValues) {
+	sort.Stable(byValue(values))
+	sort.Stable(byKey(values))
+}
+
+//
+// Check if the string parsing error indicates that the Mapping
+// should no longer be parsed.
+//
+func stopValueRead(err error) bool {
+	return err.Error() == "error parsing string: zero length"
+}
+
+//
+// Determine if the first byte in a slice of bytes is the provided byte.
+//
+func beginsWith(bytes []byte, chr byte) bool {
+	return len(bytes) != 0 &&
+		bytes[0] == chr
+}

lib/common/mapping_test.go

@@ -0,0 +1,187 @@
+package common
+
+import (
+	"bytes"
+	"errors"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestValuesExclusesPairWithBadData(t *testing.T) {
+	assert := assert.New(t)
+
+	bad_key := Mapping([]byte{0x00, 0x0c, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b, 0x00})
+	values, errs := bad_key.Values()
+
+	if assert.Equal(len(values), 1, "Values() did not return valid values when some values had bad key") {
+		key, _ := values[0][0].Data()
+		val, _ := values[0][1].Data()
+		assert.Equal(key, "a", "Values() returned by data with invalid key contains incorrect present key")
+		assert.Equal(val, "b", "Values() returned by data with invalid key contains incorrect present key")
+	}
+	assert.Equal(len(errs), 2, "Values() reported wrong error count when some values had invalid data")
+}
+
+func TestValuesWarnsMissingData(t *testing.T) {
+	assert := assert.New(t)
+
+	mapping := Mapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62})
+	_, errs := mapping.Values()
+
+	if assert.Equal(len(errs), 2, "Values() reported wrong error count when mapping had missing data") {
+		assert.Equal(errs[0].Error(), "warning parsing mapping: mapping length exceeds provided data", "correct error message should be returned")
+	}
+}
+
+func TestValuesWarnsExtraData(t *testing.T) {
+	assert := assert.New(t)
+
+	mapping := Mapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b, 0x00})
+	_, errs := mapping.Values()
+
+	if assert.Equal(len(errs), 2, "Values() reported wrong error count when mapping had extra data") {
+		assert.Equal(errs[0].Error(), "warning parsing mapping: data exists beyond length of mapping", "correct error message should be returned")
+	}
+}
+
+func TestValuesEnforcesEqualDelimitor(t *testing.T) {
+	assert := assert.New(t)
+
+	mapping := Mapping([]byte{0x00, 0x06, 0x01, 0x61, 0x30, 0x01, 0x62, 0x3b})
+	values, errs := mapping.Values()
+
+	if assert.Equal(len(errs), 1, "Values() reported wrong error count when mapping had = format error") {
+		assert.Equal(errs[0].Error(), "mapping format violation, expected =", "correct error message should be returned")
+	}
+	assert.Equal(len(values), 0, "Values() not empty with invalid data due to = format error")
+}
+
+func TestValuesEnforcedSemicolonDelimitor(t *testing.T) {
+	assert := assert.New(t)
+
+	mapping := Mapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x30})
+	values, errs := mapping.Values()
+
+	if assert.Equal(len(errs), 1, "Values() reported wrong error count when mapping had ; format error") {
+		assert.Equal(errs[0].Error(), "mapping format violation, expected ;", "correct error message should be returned")
+	}
+	assert.Equal(len(values), 0, "Values() not empty with invalid data due to ; format error")
+}
+
+func TestValuesReturnsValues(t *testing.T) {
+	assert := assert.New(t)
+
+	mapping := Mapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b})
+	values, errs := mapping.Values()
+	key, kerr := values[0][0].Data()
+	val, verr := values[0][1].Data()
+
+	assert.Nil(errs, "Values() returned a errors with parsing valid data")
+	assert.Nil(kerr)
+	assert.Nil(verr)
+	assert.Equal(key, "a", "Values() did not return key in valid data")
+	assert.Equal(val, "b", "Values() did not return value in valid data")
+}
+
+func TestHasDuplicateKeysTrueWhenDuplicates(t *testing.T) {
+	assert := assert.New(t)
+
+	dups := Mapping([]byte{0x00, 0x0c, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b})
+
+	assert.Equal(dups.HasDuplicateKeys(), true, "HasDuplicateKeys() did not report true when duplicate keys present")
+}
+
+func TestHasDuplicateKeysFalseWithoutDuplicates(t *testing.T) {
+	assert := assert.New(t)
+
+	mapping := Mapping([]byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b})
+
+	assert.Equal(mapping.HasDuplicateKeys(), false, "HasDuplicateKeys() did not report false when no duplicate keys present")
+}
+
+func TestGoMapToMappingProducesCorrectMapping(t *testing.T) {
+	assert := assert.New(t)
+
+	gomap := map[string]string{"a": "b"}
+	mapping, err := GoMapToMapping(gomap)
+
+	assert.Nil(err, "GoMapToMapping() returned error with valid data")
+	expected := []byte{0x00, 0x06, 0x01, 0x61, 0x3d, 0x01, 0x62, 0x3b}
+	if bytes.Compare(mapping, expected) != 0 {
+		t.Fatal("GoMapToMapping did not produce correct Mapping", mapping, expected)
+	}
+}
+
+func TestMappingOrderSortsValuesThenKeys(t *testing.T) {
+	a, _ := ToI2PString("a")
+	b, _ := ToI2PString("b")
+	values := MappingValues{
+		[2]String{b, b},
+		[2]String{b, a},
+		[2]String{a, b},
+		[2]String{a, a},
+	}
+	mappingOrder(values)
+	for i, pair := range values {
+		key, _ := pair[0].Data()
+		value, _ := pair[1].Data()
+		switch i {
+		case 0:
+			if !(key == "a" && value == "a") {
+				t.Fatal("mappingOrder produced incorrect sort output at", i)
+			}
+		case 1:
+			if !(key == "a" && value == "b") {
+				t.Fatal("mappingOrder produced incorrect sort output at", i)
+			}
+		case 2:
+			if !(key == "b" && value == "a") {
+				t.Fatal("mappingOrder produced incorrect sort output at", i)
+			}
+		case 3:
+			if !(key == "b" && value == "b") {
+				t.Fatal("mappingOrder produced incorrect sort output at", i)
+			}
+		}
+	}
+}
+
+func TestStopValueReadTrueWhenCorrectErr(t *testing.T) {
+	assert := assert.New(t)
+
+	status := stopValueRead(errors.New("error parsing string: zero length"))
+
+	assert.Equal(status, true, "stopValueRead() did not return true when String error found")
+}
+
+func TestStopValueReadFalseWhenWrongErr(t *testing.T) {
+	assert := assert.New(t)
+
+	status := stopValueRead(errors.New("something else"))
+
+	assert.Equal(status, false, "stopValueRead() did not return false when non String error found")
+}
+
+func TestBeginsWithCorrectWhenTrue(t *testing.T) {
+	assert := assert.New(t)
+
+	slice := []byte{0x41}
+
+	assert.Equal(beginsWith(slice, 0x41), true, "beginsWith() did not return true when correct")
+}
+
+func TestBeginsWithCorrectWhenFalse(t *testing.T) {
+	assert := assert.New(t)
+
+	slice := []byte{0x00}
+
+	assert.Equal(beginsWith(slice, 0x41), false, "beginsWith() did not false when incorrect")
+}
+
+func TestBeginsWithCorrectWhenNil(t *testing.T) {
+	assert := assert.New(t)
+
+	slice := make([]byte, 0)
+
+	assert.Equal(beginsWith(slice, 0x41), false, "beginsWith() did not return false on empty slice")
+}

lib/common/router_address.go

@@ -0,0 +1,161 @@
+package common
+
+/*
+I2P RouterAddress
+https://geti2p.net/spec/common-structures#routeraddress
+Accurate for version 0.9.24
+
++----+----+----+----+----+----+----+----+
+|cost|           expiration
++----+----+----+----+----+----+----+----+
+     |        transport_style           |
++----+----+----+----+-//-+----+----+----+
+|                                       |
++                                       +
+|               options                 |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+
+cost :: Integer
+        length -> 1 byte
+
+        case 0 -> free
+        case 255 -> expensive
+
+expiration :: Date (must be all zeros, see notes below)
+              length -> 8 bytes
+
+              case null -> never expires
+
+transport_style :: String
+                   length -> 1-256 bytes
+
+options :: Mapping
+*/
+
+import (
+	"errors"
+	log "github.com/sirupsen/logrus"
+)
+
+// Minimum number of bytes in a valid RouterAddress
+const (
+	ROUTER_ADDRESS_MIN_SIZE = 9
+)
+
+type RouterAddress []byte
+
+//
+// Return the cost integer for this RouterAddress and any errors encountered
+// parsing the RouterAddress.
+//
+func (router_address RouterAddress) Cost() (cost *Integer, err error) {
+	err, exit := router_address.checkValid()
+	if exit {
+		return
+	}
+	cost, err = NewInteger([]byte{router_address[0]})
+	return
+}
+
+//
+// Return the Date this RouterAddress expires and any errors encountered
+// parsing the RouterAddress.
+//
+func (router_address RouterAddress) Expiration() (date Date, err error) {
+	err, exit := router_address.checkValid()
+	if exit {
+		return
+	}
+	copy(date[:], router_address[1:ROUTER_ADDRESS_MIN_SIZE])
+	return
+}
+
+//
+// Return the Transport type for this RouterAddress and any errors encountered
+// parsing the RouterAddress.
+//
+func (router_address RouterAddress) TransportStyle() (str String, err error) {
+	err, exit := router_address.checkValid()
+	if exit {
+		return
+	}
+	str, _, err = ReadString(router_address[ROUTER_ADDRESS_MIN_SIZE:])
+	return
+}
+
+//
+// Return the Mapping containing the options for this RouterAddress and any
+// errors encountered parsing the RouterAddress.
+//
+func (router_address RouterAddress) Options() (mapping Mapping, err error) {
+	err, exit := router_address.checkValid()
+	if exit {
+		return
+	}
+	_, remainder, err := ReadString(router_address[ROUTER_ADDRESS_MIN_SIZE:])
+	if len(remainder) == 0 {
+		return
+	}
+	mapping = Mapping(remainder)
+	return
+}
+
+//
+// Check if the RouterAddress is empty or if it is too small to contain valid data.
+//
+func (router_address RouterAddress) checkValid() (err error, exit bool) {
+	addr_len := len(router_address)
+	exit = false
+	if addr_len == 0 {
+		log.WithFields(log.Fields{
+			"at":     "(RouterAddress) checkValid",
+			"reason": "no data",
+		}).Error("invalid router address")
+		err = errors.New("error parsing RouterAddress: no data")
+		exit = true
+	} else if addr_len < ROUTER_ADDRESS_MIN_SIZE {
+		log.WithFields(log.Fields{
+			"at":     "(RouterAddress) checkValid",
+			"reason": "data too small (len < ROUTER_ADDRESS_MIN_SIZE)",
+		}).Warn("router address format warning")
+		err = errors.New("warning parsing RouterAddress: data too small")
+	}
+	return
+}
+
+//
+// Given a slice of bytes, read a RouterAddress, returning the remaining bytes and any
+// errors encountered parsing the RouterAddress.
+//
+func ReadRouterAddress(data []byte) (router_address RouterAddress, remainder []byte, err error) {
+	test_address := RouterAddress(data)
+	err, _ = test_address.checkValid()
+	if err != nil {
+		return
+	}
+	router_address = append(router_address, data[:ROUTER_ADDRESS_MIN_SIZE]...)
+	str, remainder, err := ReadString(data[ROUTER_ADDRESS_MIN_SIZE:])
+	if err != nil {
+		return
+	}
+	router_address = append(router_address, str...)
+	map_size := &Integer{}
+	mapping := make([]byte, 0)
+	if len(remainder) >= 2 {
+		map_size, err = NewInteger(remainder[:2])
+		if len(remainder) < map_size.Value()+2 {
+			err = errors.New("not enough data for map inside router address")
+			router_address = RouterAddress([]byte{})
+			remainder = []byte{}
+			return
+		}
+		mapping = remainder[:map_size.Value()+2]
+		router_address = append(router_address, mapping...)
+	}
+
+	remainder = data[ROUTER_ADDRESS_MIN_SIZE+len(str)+len(mapping):]
+	return
+}

lib/common/router_address/doc.md

@@ -1,179 +0,0 @@
-# router_address
---
-    import "github.com/go-i2p/go-i2p/lib/common/router_address"
-
-Package router_address implements the I2P RouterAddress common data structure
-
-## Usage
-
-```go
-const (
-	ROUTER_ADDRESS_MIN_SIZE = 9
-)
-```
-Minimum number of bytes in a valid RouterAddress
-
-#### type RouterAddress
-
-```go
-type RouterAddress struct {
-	TransportCost    *Integer
-	ExpirationDate   *Date
-	TransportType    I2PString
-	TransportOptions *Mapping
-}
-```
-
-RouterAddress is the represenation of an I2P RouterAddress.
-
-https://geti2p.net/spec/common-structures#routeraddress
-
-#### func  ReadRouterAddress
-
-```go
-func ReadRouterAddress(data []byte) (router_address RouterAddress, remainder []byte, err error)
-```
-ReadRouterAddress returns RouterAddress from a []byte. The remaining bytes after
-the specified length are also returned. Returns a list of errors that occurred
-during parsing.
-
-#### func (RouterAddress) Bytes
-
-```go
-func (router_address RouterAddress) Bytes() []byte
-```
-Bytes returns the router address as a []byte.
-
-#### func (RouterAddress) Cost
-
-```go
-func (router_address RouterAddress) Cost() int
-```
-Cost returns the cost for this RouterAddress as a Go integer.
-
-#### func (RouterAddress) Expiration
-
-```go
-func (router_address RouterAddress) Expiration() Date
-```
-Expiration returns the expiration for this RouterAddress as an I2P Date.
-
-#### func (RouterAddress) GetOption
-
-```go
-func (router_address RouterAddress) GetOption(key I2PString) I2PString
-```
-GetOption returns the value of the option specified by the key
-
-#### func (RouterAddress) Host
-
-```go
-func (router_address RouterAddress) Host() (net.Addr, error)
-```
-
-#### func (RouterAddress) HostString
-
-```go
-func (router_address RouterAddress) HostString() I2PString
-```
-
-#### func (RouterAddress) InitializationVector
-
-```go
-func (router_address RouterAddress) InitializationVector() ([32]byte, error)
-```
-
-#### func (RouterAddress) InitializationVectorString
-
-```go
-func (router_address RouterAddress) InitializationVectorString() I2PString
-```
-
-#### func (RouterAddress) IntroducerExpirationString
-
-```go
-func (router_address RouterAddress) IntroducerExpirationString(num int) I2PString
-```
-
-#### func (RouterAddress) IntroducerHashString
-
-```go
-func (router_address RouterAddress) IntroducerHashString(num int) I2PString
-```
-
-#### func (RouterAddress) IntroducerTagString
-
-```go
-func (router_address RouterAddress) IntroducerTagString(num int) I2PString
-```
-
-#### func (*RouterAddress) Network
-
-```go
-func (router_address *RouterAddress) Network() string
-```
-Network implements net.Addr. It returns the transport type
-
-#### func (RouterAddress) Options
-
-```go
-func (router_address RouterAddress) Options() Mapping
-```
-Options returns the options for this RouterAddress as an I2P Mapping.
-
-#### func (RouterAddress) Port
-
-```go
-func (router_address RouterAddress) Port() (string, error)
-```
-
-#### func (RouterAddress) PortString
-
-```go
-func (router_address RouterAddress) PortString() I2PString
-```
-
-#### func (RouterAddress) ProtocolVersion
-
-```go
-func (router_address RouterAddress) ProtocolVersion() (string, error)
-```
-
-#### func (RouterAddress) ProtocolVersionString
-
-```go
-func (router_address RouterAddress) ProtocolVersionString() I2PString
-```
-
-#### func (RouterAddress) StaticKey
-
-```go
-func (router_address RouterAddress) StaticKey() ([32]byte, error)
-```
-
-#### func (RouterAddress) StaticKeyString
-
-```go
-func (router_address RouterAddress) StaticKeyString() I2PString
-```
-
-#### func (*RouterAddress) String
-
-```go
-func (router_address *RouterAddress) String() string
-```
-String implements net.Addr. It returns the IP address, followed by the options
-
-#### func (RouterAddress) TransportStyle
-
-```go
-func (router_address RouterAddress) TransportStyle() I2PString
-```
-TransportStyle returns the transport style for this RouterAddress as an
-I2PString.
-
-#### func (*RouterAddress) UDP
-
-```go
-func (router_address *RouterAddress) UDP() bool
-```

lib/common/router_address/router_address.go

@@ -1,322 +0,0 @@
-// Package router_address implements the I2P RouterAddress common data structure
-package router_address
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-
-	. "github.com/go-i2p/go-i2p/lib/common/data"
-	log "github.com/sirupsen/logrus"
-)
-
-// Minimum number of bytes in a valid RouterAddress
-const (
-	ROUTER_ADDRESS_MIN_SIZE = 9
-)
-
-/*
-[RouterAddress]
-Accurate for version 0.9.49
-
-Description
-This structure defines the means to contact a router through a transport protocol.
-
-Contents
-1 byte Integer defining the relative cost of using the address, where 0 is free and 255 is
-expensive, followed by the expiration Date after which the address should not be used,
-of if null, the address never expires. After that comes a String defining the transport
-protocol this router address uses. Finally there is a Mapping containing all of the
-transport specific options necessary to establish the connection, such as IP address,
-port number, email address, URL, etc.
-
-
-+----+----+----+----+----+----+----+----+
-|cost|           expiration
-+----+----+----+----+----+----+----+----+
-     |        transport_style           |
-+----+----+----+----+-//-+----+----+----+
-|                                       |
-+                                       +
-|               options                 |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-
-cost :: Integer
-        length -> 1 byte
-
-        case 0 -> free
-        case 255 -> expensive
-
-expiration :: Date (must be all zeros, see notes below)
-              length -> 8 bytes
-
-              case null -> never expires
-
-transport_style :: String
-                   length -> 1-256 bytes
-
-options :: Mapping
-*/
-
-// RouterAddress is the represenation of an I2P RouterAddress.
-//
-// https://geti2p.net/spec/common-structures#routeraddress
-type RouterAddress struct {
-	TransportCost    *Integer
-	ExpirationDate   *Date
-	TransportType    I2PString
-	TransportOptions *Mapping
-}
-
-// Network implements net.Addr. It returns the transport type plus 4 or 6
-func (router_address *RouterAddress) Network() string {
-	if router_address.TransportType == nil {
-		return ""
-	}
-	str, err := router_address.TransportType.Data()
-	if err != nil {
-		return ""
-	}
-	return string(str) + router_address.IPVersion()
-}
-
-// IPVersion returns a string "4" for IPv4 or 6 for IPv6
-func (router_address *RouterAddress) IPVersion() string {
-	str, err := router_address.CapsString().Data()
-	if err != nil {
-		return ""
-	}
-	if strings.HasSuffix(str, "6") {
-		return "6"
-	}
-	return "4"
-}
-
-func (router_address *RouterAddress) UDP() bool {
-	return strings.HasPrefix(strings.ToLower(router_address.Network()), "ssu")
-}
-
-// String implements net.Addr. It returns the IP address, followed by the options
-func (router_address *RouterAddress) String() string {
-	var rv []string
-	rv = append(rv, string(router_address.TransportStyle()))
-	rv = append(rv, string(router_address.HostString()))
-	rv = append(rv, string(router_address.PortString()))
-	rv = append(rv, string(router_address.StaticKeyString()))
-	rv = append(rv, string(router_address.InitializationVectorString()))
-	rv = append(rv, string(router_address.ProtocolVersionString()))
-	if router_address.UDP() {
-		rv = append(rv, string(router_address.IntroducerHashString(0)))
-		rv = append(rv, string(router_address.IntroducerExpirationString(0)))
-		rv = append(rv, string(router_address.IntroducerTagString(0)))
-		rv = append(rv, string(router_address.IntroducerHashString(1)))
-		rv = append(rv, string(router_address.IntroducerExpirationString(1)))
-		rv = append(rv, string(router_address.IntroducerTagString(1)))
-		rv = append(rv, string(router_address.IntroducerHashString(2)))
-		rv = append(rv, string(router_address.IntroducerExpirationString(2)))
-		rv = append(rv, string(router_address.IntroducerTagString(2)))
-	}
-	return strings.TrimSpace(strings.Join(rv, " "))
-}
-
-var ex_addr net.Addr = &RouterAddress{}
-
-// Bytes returns the router address as a []byte.
-func (router_address RouterAddress) Bytes() []byte {
-	bytes := make([]byte, 0)
-	bytes = append(bytes, router_address.TransportCost.Bytes()...)
-	bytes = append(bytes, router_address.ExpirationDate.Bytes()...)
-	strData, err := router_address.TransportType.Data()
-	if err != nil {
-		log.WithFields(log.Fields{
-			"error": err,
-		}).Error("RouterAddress.Bytes: error getting transport_style bytes")
-	} else {
-		bytes = append(bytes, strData...)
-	}
-	bytes = append(bytes, router_address.TransportOptions.Data()...)
-	return bytes
-}
-
-// Cost returns the cost for this RouterAddress as a Go integer.
-func (router_address RouterAddress) Cost() int {
-	return router_address.TransportCost.Int()
-}
-
-// Expiration returns the expiration for this RouterAddress as an I2P Date.
-func (router_address RouterAddress) Expiration() Date {
-	return *router_address.ExpirationDate
-}
-
-// TransportStyle returns the transport style for this RouterAddress as an I2PString.
-func (router_address RouterAddress) TransportStyle() I2PString {
-	return router_address.TransportType
-}
-
-// GetOption returns the value of the option specified by the key
-func (router_address RouterAddress) GetOption(key I2PString) I2PString {
-	return router_address.Options().Values().Get(key)
-}
-
-func (router_address RouterAddress) HostString() I2PString {
-	host, _ := ToI2PString("host")
-	return router_address.GetOption(host)
-}
-
-func (router_address RouterAddress) PortString() I2PString {
-	port, _ := ToI2PString("port")
-	return router_address.GetOption(port)
-}
-
-func (router_address RouterAddress) CapsString() I2PString {
-	caps, _ := ToI2PString("caps")
-	return router_address.GetOption(caps)
-}
-
-func (router_address RouterAddress) StaticKeyString() I2PString {
-	sk, _ := ToI2PString("s")
-	return router_address.GetOption(sk)
-}
-
-func (router_address RouterAddress) InitializationVectorString() I2PString {
-	iv, _ := ToI2PString("i")
-	return router_address.GetOption(iv)
-}
-
-func (router_address RouterAddress) ProtocolVersionString() I2PString {
-	v, _ := ToI2PString("v")
-	return router_address.GetOption(v)
-}
-
-func (router_address RouterAddress) IntroducerHashString(num int) I2PString {
-	if num >= 0 && num <= 2 {
-		val := strconv.Itoa(num)
-		v, _ := ToI2PString("ih" + val)
-		return router_address.GetOption(v)
-	}
-	v, _ := ToI2PString("ih0")
-	return router_address.GetOption(v)
-}
-
-func (router_address RouterAddress) IntroducerExpirationString(num int) I2PString {
-	if num >= 0 && num <= 2 {
-		val := strconv.Itoa(num)
-		v, _ := ToI2PString("iexp" + val)
-		return router_address.GetOption(v)
-	}
-	v, _ := ToI2PString("iexp0")
-	return router_address.GetOption(v)
-}
-
-func (router_address RouterAddress) IntroducerTagString(num int) I2PString {
-	if num >= 0 && num <= 2 {
-		val := strconv.Itoa(num)
-		v, _ := ToI2PString("itag" + val)
-		return router_address.GetOption(v)
-	}
-	v, _ := ToI2PString("itag0")
-	return router_address.GetOption(v)
-}
-
-func (router_address RouterAddress) Host() (net.Addr, error) {
-	host := router_address.HostString()
-	hostBytes, err := host.Data()
-	if err != nil {
-		return nil, err
-	}
-	ip := net.ParseIP(hostBytes)
-	if ip == nil {
-		return nil, fmt.Errorf("null host error")
-	}
-	return net.ResolveIPAddr("", ip.String())
-}
-
-func (router_address RouterAddress) Port() (string, error) {
-	port := router_address.PortString()
-	portBytes, err := port.Data()
-	if err != nil {
-		return "", err
-	}
-	val, err := strconv.Atoi(portBytes)
-	if err != nil {
-		return "", err
-	}
-	return strconv.Itoa(val), nil
-}
-
-func (router_address RouterAddress) StaticKey() ([32]byte, error) {
-	sk := router_address.StaticKeyString()
-	if len([]byte(sk)) != 32 {
-		return [32]byte{}, fmt.Errorf("error: invalid static key")
-	}
-	return [32]byte(sk), nil
-}
-
-func (router_address RouterAddress) InitializationVector() ([32]byte, error) {
-	iv := router_address.InitializationVectorString()
-	if len([]byte(iv)) != 32 {
-		return [32]byte{}, fmt.Errorf("error: invalid static key")
-	}
-	return [32]byte(iv), nil
-}
-
-func (router_address RouterAddress) ProtocolVersion() (string, error) {
-	return router_address.ProtocolVersionString().Data()
-}
-
-// Options returns the options for this RouterAddress as an I2P Mapping.
-func (router_address RouterAddress) Options() Mapping {
-	return *router_address.TransportOptions
-}
-
-// Check if the RouterAddress is empty or if it is too small to contain valid data.
-func (router_address RouterAddress) checkValid() (err error, exit bool) {
-	return
-}
-
-// ReadRouterAddress returns RouterAddress from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadRouterAddress(data []byte) (router_address RouterAddress, remainder []byte, err error) {
-	if len(data) == 0 {
-		log.WithField("at", "(RouterAddress) ReadRouterAddress").Error("error parsing RouterAddress: no data")
-		err = errors.New("error parsing RouterAddress: no data")
-		return
-	}
-	router_address.TransportCost, remainder, err = NewInteger(data, 1)
-	if err != nil {
-		log.WithFields(log.Fields{
-			"at":     "(RouterAddress) ReadNewRouterAddress",
-			"reason": "error parsing cost",
-		}).Warn("error parsing RouterAddress")
-	}
-	router_address.ExpirationDate, remainder, err = NewDate(remainder)
-	if err != nil {
-		log.WithFields(log.Fields{
-			"at":     "(RouterAddress) ReadNewRouterAddress",
-			"reason": "error parsing expiration",
-		}).Error("error parsing RouterAddress")
-	}
-	router_address.TransportType, remainder, err = ReadI2PString(remainder)
-	if err != nil {
-		log.WithFields(log.Fields{
-			"at":     "(RouterAddress) ReadNewRouterAddress",
-			"reason": "error parsing transport_style",
-		}).Error("error parsing RouterAddress")
-	}
-	var errs []error
-	router_address.TransportOptions, remainder, errs = NewMapping(remainder)
-	for _, err := range errs {
-		log.WithFields(log.Fields{
-			"at":     "(RouterAddress) ReadNewRouterAddress",
-			"reason": "error parsing options",
-			"error":  err,
-		}).Error("error parsing RozuterAddress")
-	}
-	return
-}

lib/common/router_address_test.go

@@ -1,46 +1,41 @@
-package router_address
+package common
 
 import (
 	"bytes"
-	"testing"
-
-	. "github.com/go-i2p/go-i2p/lib/common/data"
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestCheckValidReportsEmptySlice(t *testing.T) {
 	assert := assert.New(t)
 
-	router_address, _, err := ReadRouterAddress([]byte{})
+	router_address := RouterAddress([]byte{})
+	err, exit := router_address.checkValid()
 
 	if assert.NotNil(err) {
 		assert.Equal(err.Error(), "error parsing RouterAddress: no data", "correct error message should be returned")
 	}
-	err, exit := router_address.checkValid()
 	assert.Equal(exit, true, "checkValid did not indicate to stop parsing on empty slice")
 }
 
 func TestCheckRouterAddressValidReportsDataMissing(t *testing.T) {
 	assert := assert.New(t)
 
-	router_address, _, err := ReadRouterAddress([]byte{0x01})
+	router_address := RouterAddress([]byte{0x01})
+	err, exit := router_address.checkValid()
 
 	if assert.NotNil(err) {
 		assert.Equal(err.Error(), "warning parsing RouterAddress: data too small", "correct error message should be returned")
 	}
-
-	err, exit := router_address.checkValid()
 	assert.Equal(exit, false, "checkValid indicates to stop parsing when some fields  may be present")
 }
 
 func TestCheckRouterAddressValidNoErrWithValidData(t *testing.T) {
 	assert := assert.New(t)
 
-	router_address, _, _ := ReadRouterAddress([]byte{0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00})
-	mapping, err := GoMapToMapping(map[string]string{"host": "127.0.0.1", "port": "4567"})
-	assert.Nil(err, "GoMapToMapping() returned error with valid data")
-	router_address.TransportOptions = mapping
-	// router_address = append(router_address, mapping...)
+	router_address := RouterAddress([]byte{0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00})
+	mapping, _ := GoMapToMapping(map[string]string{"host": "127.0.0.1", "port": "4567"})
+	router_address = append(router_address, mapping...)
 	err, exit := router_address.checkValid()
 
 	assert.Nil(err, "checkValid() reported error with valid data")
@@ -50,8 +45,8 @@ func TestCheckRouterAddressValidNoErrWithValidData(t *testing.T) {
 func TestRouterAddressCostReturnsFirstByte(t *testing.T) {
 	assert := assert.New(t)
 
-	router_address, _, err := ReadRouterAddress([]byte{0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00})
-	cost := router_address.Cost()
+	router_address := RouterAddress([]byte{0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00})
+	cost, err := router_address.Cost()
 
 	assert.Nil(err, "Cost() returned error with valid data")
 	assert.Equal(cost, 6, "Cost() returned wrong cost")
@@ -60,8 +55,8 @@ func TestRouterAddressCostReturnsFirstByte(t *testing.T) {
 func TestRouterAddressExpirationReturnsCorrectData(t *testing.T) {
 	assert := assert.New(t)
 
-	router_address, _, err := ReadRouterAddress([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00})
-	expiration := router_address.Expiration()
+	router_address := RouterAddress([]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00})
+	expiration, err := router_address.Expiration()
 
 	assert.Nil(err, "Expiration() returned error with valid data")
 	if bytes.Compare(expiration[:], []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}) != 0 {
@@ -76,7 +71,7 @@ func TestReadRouterAddressReturnsCorrectRemainderWithoutError(t *testing.T) {
 	str, _ := ToI2PString("foo")
 	mapping, _ := GoMapToMapping(map[string]string{"host": "127.0.0.1", "port": "4567"})
 	router_address_bytes = append(router_address_bytes, []byte(str)...)
-	router_address_bytes = append(router_address_bytes, mapping.Data()...)
+	router_address_bytes = append(router_address_bytes, mapping...)
 	router_address_bytes = append(router_address_bytes, []byte{0x01, 0x02, 0x03}...)
 	router_address, remainder, err := ReadRouterAddress(router_address_bytes)
 

lib/common/router_identity.go

@@ -0,0 +1,41 @@
+package common
+
+/*
+I2P RouterIdentity
+https://geti2p.net/spec/common-structures#routeridentity
+Accurate for version 0.9.24
+
+Identical to KeysAndCert
+*/
+
+import (
+	"github.com/go-i2p/go-i2p/lib/crypto"
+)
+
+//
+// A RouterIdentity is identical to KeysAndCert.
+//
+type RouterIdentity struct {
+	KeysAndCert
+}
+
+func (router_identity RouterIdentity) PublicKey() (crypto.PublicKey, error) {
+	return router_identity.PublicKey()
+}
+
+func (router_identity RouterIdentity) SigningPublicKey() (crypto.SigningPublicKey, error) {
+	return router_identity.SigningPublicKey()
+}
+
+func (router_identity RouterIdentity) Certificate() (Certificate, error) {
+	return router_identity.Certificate()
+}
+
+func ReadRouterIdentity(data []byte) (router_identity RouterIdentity, remainder []byte, err error) {
+	keys_and_cert, remainder, err := ReadKeysAndCert(data)
+	if err != nil {
+		return
+	}
+	router_identity.KeysAndCert = keys_and_cert
+	return
+}

lib/common/router_identity/doc.md

@@ -1,28 +0,0 @@
-# router_identity
---
-    import "github.com/go-i2p/go-i2p/lib/common/router_identity"
-
-Package router_identity implements the I2P RouterIdentity common data structure
-
-## Usage
-
-#### type RouterIdentity
-
-```go
-type RouterIdentity struct {
-	KeysAndCert
-}
-```
-
-RouterIdentity is the represenation of an I2P RouterIdentity.
-
-https://geti2p.net/spec/common-structures#routeridentity
-
-#### func  ReadRouterIdentity
-
-```go
-func ReadRouterIdentity(data []byte) (router_identity RouterIdentity, remainder []byte, err error)
-```
-ReadRouterIdentity returns RouterIdentity from a []byte. The remaining bytes
-after the specified length are also returned. Returns a list of errors that
-occurred during parsing.

lib/common/router_identity/router_identity.go

@@ -1,35 +0,0 @@
-// Package router_identity implements the I2P RouterIdentity common data structure
-package router_identity
-
-import (
-	. "github.com/go-i2p/go-i2p/lib/common/keys_and_cert"
-)
-
-/*
-[RouterIdentity]
-Accurate for version 0.9.49
-
-Description
-Defines the way to uniquely identify a particular router
-
-Contents
-Identical to KeysAndCert.
-*/
-
-// RouterIdentity is the represenation of an I2P RouterIdentity.
-//
-// https://geti2p.net/spec/common-structures#routeridentity
-type RouterIdentity struct {
-	KeysAndCert
-}
-
-// ReadRouterIdentity returns RouterIdentity from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadRouterIdentity(data []byte) (router_identity RouterIdentity, remainder []byte, err error) {
-	keys_and_cert, remainder, err := ReadKeysAndCert(data)
-	router_identity = RouterIdentity{
-		keys_and_cert,
-	}
-	return
-}

lib/common/router_info.go

@@ -0,0 +1,268 @@
+package common
+
+/*
+I2P RouterInfo
+https://geti2p.net/spec/common-structures#routerinfo
+Accurate for version 0.9.24
+
++----+----+----+----+----+----+----+----+
+| router_ident                          |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| published                             |
++----+----+----+----+----+----+----+----+
+|size| RouterAddress 0                  |
++----+                                  +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| RouterAddress 1                       |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+----+----+----+----+
+| RouterAddress ($size-1)               |
++                                       +
+|                                       |
+~                                       ~
+~                                       ~
+|                                       |
++----+----+----+----+-//-+----+----+----+
+|psiz| options                          |
++----+----+----+----+-//-+----+----+----+
+| signature                             |
++                                       +
+|                                       |
++                                       +
+|                                       |
++                                       +
+|                                       |
++                                       +
+|                                       |
++----+----+----+----+----+----+----+----+
+
+router_ident :: RouterIdentity
+                length -> >= 387 bytes
+
+published :: Date
+             length -> 8 bytes
+
+size :: Integer
+        length -> 1 byte
+        The number of RouterAddresses to follow, 0-255
+
+addresses :: [RouterAddress]
+             length -> varies
+
+peer_size :: Integer
+             length -> 1 byte
+             The number of peer Hashes to follow, 0-255, unused, always zero
+             value -> 0
+
+options :: Mapping
+
+signature :: Signature
+             length -> 40 bytes
+*/
+
+import (
+	"errors"
+	log "github.com/sirupsen/logrus"
+)
+
+type RouterInfo []byte
+
+//
+// Read a RouterIdentity from the RouterInfo, returning the RouterIdentity and any errors
+// encountered parsing the RouterIdentity.
+//
+func (router_info RouterInfo) RouterIdentity() (router_identity RouterIdentity, err error) {
+	router_identity, _, err = ReadRouterIdentity(router_info)
+	return
+}
+
+//
+// Calculate this RouterInfo's Identity Hash (the sha256 of the RouterIdentity)
+// returns error if the RouterIdentity is malformed
+//
+func (router_info RouterInfo) IdentHash() (h Hash, err error) {
+	var ri RouterIdentity
+	ri, err = router_info.RouterIdentity()
+	if err == nil {
+		h = HashData(ri.Bytes())
+	}
+	return
+}
+
+//
+// Return the Date the RouterInfo was published and any errors encountered parsing the RouterInfo.
+//
+func (router_info RouterInfo) Published() (date Date, err error) {
+	_, remainder, err := ReadRouterIdentity(router_info)
+	if err != nil {
+		return
+	}
+	remainder_len := len(remainder)
+	if remainder_len < 8 {
+		log.WithFields(log.Fields{
+			"at":           "(RouterInfo) Published",
+			"data_len":     remainder_len,
+			"required_len": 8,
+			"reason":       "not enough data",
+		}).Error("error parsing router info")
+		err = errors.New("error parsing date: not enough data")
+		return
+	}
+	copy(date[:], remainder[:8])
+	return
+}
+
+//
+// Return the Integer representing the number of RouterAddresses that are contained in this RouterInfo.
+//
+func (router_info RouterInfo) RouterAddressCount() (count *Integer, err error) {
+	_, remainder, err := ReadRouterIdentity(router_info)
+	if err != nil {
+		return
+	}
+	remainder_len := len(remainder)
+	if remainder_len < 9 {
+		log.WithFields(log.Fields{
+			"at":           "(RouterInfo) RouterAddressCount",
+			"data_len":     remainder_len,
+			"required_len": 9,
+			"reason":       "not enough data",
+		}).Error("error parsing router info")
+		err = errors.New("error parsing router addresses: not enough data")
+		return
+	}
+	count, err = NewInteger([]byte{remainder[8]})
+	return
+}
+
+//
+// Read the RouterAddresses inside this RouterInfo and return them in a slice, returning
+// a partial list if data is missing.
+//
+func (router_info RouterInfo) RouterAddresses() (router_addresses []RouterAddress, err error) {
+	_, remainder, err := ReadRouterIdentity(router_info)
+	if err != nil {
+		return
+	}
+	remainder_len := len(remainder)
+	if remainder_len < 9 {
+		log.WithFields(log.Fields{
+			"at":           "(RouterInfo) RouterAddresses",
+			"data_len":     remainder_len,
+			"required_len": 9,
+			"reason":       "not enough data",
+		}).Error("error parsing router info")
+		err = errors.New("error parsing router addresses: not enough data")
+		return
+	}
+	remaining := remainder[9:]
+	var router_address RouterAddress
+	addr_count, cerr := router_info.RouterAddressCount()
+	if cerr != nil {
+		err = cerr
+		return
+	}
+	for i := 0; i < addr_count.Value(); i++ {
+		router_address, remaining, err = ReadRouterAddress(remaining)
+		if err == nil {
+			router_addresses = append(router_addresses, router_address)
+		}
+	}
+	return
+}
+
+//
+// Return the PeerSize value, currently unused and always zero.
+//
+func (router_info RouterInfo) PeerSize() int {
+	// Peer size is unused:
+	// https://geti2p.net/spec/common-structures#routeraddress
+	return 0
+}
+
+//
+// Return the Options Mapping inside this RouterInfo.
+//
+func (router_info RouterInfo) Options() (mapping Mapping) {
+	head := router_info.optionsLocation()
+	size := head + router_info.optionsSize().Value()
+	mapping = Mapping(router_info[head:size])
+	return
+}
+
+//
+// Return the signature of this router info
+//
+func (router_info RouterInfo) Signature() (signature Signature) {
+	head := router_info.optionsLocation()
+	size := head + router_info.optionsSize().Value()
+	ident, _ := router_info.RouterIdentity()
+	keyCert := ident.CertificateInterface //KeyCertificate(ident)
+	sigSize := keyCert.SignatureSize()
+	signature = Signature(router_info[size : size+sigSize])
+	return
+}
+
+//
+// Used during parsing to determine where in the RouterInfo the Mapping data begins.
+//
+func (router_info RouterInfo) optionsLocation() (location int) {
+	data, remainder, err := ReadRouterIdentity(router_info)
+	if err != nil {
+		return
+	}
+	location += len(data.Bytes())
+
+	remainder_len := len(remainder)
+	if remainder_len < 9 {
+		log.WithFields(log.Fields{
+			"at":           "(RouterInfo) optionsLocation",
+			"data_len":     remainder_len,
+			"required_len": 9,
+			"reason":       "not enough data",
+		}).Error("error parsing router info")
+		err = errors.New("error parsing router addresses: not enough data")
+		return
+	}
+	location += 9
+
+	remaining := remainder[9:]
+	var router_address RouterAddress
+	var router_addresses []RouterAddress
+	addr_count, cerr := router_info.RouterAddressCount()
+	if cerr != nil {
+		err = cerr
+		return
+	}
+	for i := 0; i < addr_count.Value(); i++ {
+		router_address, remaining, err = ReadRouterAddress(remaining)
+		if err == nil {
+			location += len(router_address)
+			router_addresses = append(router_addresses, router_address)
+		}
+	}
+	location += 1
+	return
+}
+
+//
+// Used during parsing to determine the size of the options in the RouterInfo.
+//
+func (router_info RouterInfo) optionsSize() (size *Integer) {
+	head := router_info.optionsLocation()
+	size, _ = NewInteger(router_info[head : head+2]) //+ 2
+	return
+}

lib/common/router_info/doc.md

@@ -1,139 +0,0 @@
-# router_info
---
-    import "github.com/go-i2p/go-i2p/lib/common/router_info"
-
-Package router_info implements the I2P RouterInfo common data structure
-
-## Usage
-
-```go
-const (
-	MIN_GOOD_VERSION = 58
-	MAX_GOOD_VERSION = 99
-)
-```
-
-```go
-const ROUTER_INFO_MIN_SIZE = 439
-```
-
-#### type RouterInfo
-
-```go
-type RouterInfo struct {
-}
-```
-
-RouterInfo is the represenation of an I2P RouterInfo.
-
-https://geti2p.net/spec/common-structures#routerinfo
-
-#### func  ReadRouterInfo
-
-```go
-func ReadRouterInfo(bytes []byte) (info RouterInfo, remainder []byte, err error)
-```
-ReadRouterInfo returns RouterInfo from a []byte. The remaining bytes after the
-specified length are also returned. Returns a list of errors that occurred
-during parsing.
-
-#### func (RouterInfo) Bytes
-
-```go
-func (router_info RouterInfo) Bytes() (bytes []byte, err error)
-```
-Bytes returns the RouterInfo as a []byte suitable for writing to a stream.
-
-#### func (*RouterInfo) GoodVersion
-
-```go
-func (router_info *RouterInfo) GoodVersion() bool
-```
-
-#### func (*RouterInfo) IdentHash
-
-```go
-func (router_info *RouterInfo) IdentHash() Hash
-```
-IndentHash returns the identity hash (sha256 sum) for this RouterInfo.
-
-#### func (RouterInfo) Options
-
-```go
-func (router_info RouterInfo) Options() (mapping Mapping)
-```
-Options returns the options for this RouterInfo as an I2P Mapping.
-
-#### func (*RouterInfo) PeerSize
-
-```go
-func (router_info *RouterInfo) PeerSize() int
-```
-PeerSize returns the peer size as a Go integer.
-
-#### func (*RouterInfo) Published
-
-```go
-func (router_info *RouterInfo) Published() *Date
-```
-Published returns the date this RouterInfo was published as an I2P Date.
-
-#### func (*RouterInfo) Reachable
-
-```go
-func (router_info *RouterInfo) Reachable() bool
-```
-
-#### func (*RouterInfo) RouterAddressCount
-
-```go
-func (router_info *RouterInfo) RouterAddressCount() int
-```
-RouterAddressCount returns the count of RouterAddress in this RouterInfo as a Go
-integer.
-
-#### func (*RouterInfo) RouterAddresses
-
-```go
-func (router_info *RouterInfo) RouterAddresses() []*RouterAddress
-```
-RouterAddresses returns all RouterAddresses for this RouterInfo as
-[]*RouterAddress.
-
-#### func (*RouterInfo) RouterCapabilities
-
-```go
-func (router_info *RouterInfo) RouterCapabilities() string
-```
-
-#### func (*RouterInfo) RouterIdentity
-
-```go
-func (router_info *RouterInfo) RouterIdentity() *RouterIdentity
-```
-RouterIdentity returns the router identity as *RouterIdentity.
-
-#### func (*RouterInfo) RouterVersion
-
-```go
-func (router_info *RouterInfo) RouterVersion() string
-```
-
-#### func (RouterInfo) Signature
-
-```go
-func (router_info RouterInfo) Signature() (signature Signature)
-```
-Signature returns the signature for this RouterInfo as an I2P Signature.
-
-#### func (RouterInfo) String
-
-```go
-func (router_info RouterInfo) String() string
-```
-
-#### func (*RouterInfo) UnCongested
-
-```go
-func (router_info *RouterInfo) UnCongested() bool
-```

lib/common/router_info/router_info.go

@@ -1,322 +0,0 @@
-// Package router_info implements the I2P RouterInfo common data structure
-package router_info
-
-import (
-	"errors"
-	"strconv"
-	"strings"
-
-	. "github.com/go-i2p/go-i2p/lib/common/data"
-	. "github.com/go-i2p/go-i2p/lib/common/router_address"
-	. "github.com/go-i2p/go-i2p/lib/common/router_identity"
-	. "github.com/go-i2p/go-i2p/lib/common/signature"
-	log "github.com/sirupsen/logrus"
-)
-
-const ROUTER_INFO_MIN_SIZE = 439
-
-const (
-	MIN_GOOD_VERSION = 58
-	MAX_GOOD_VERSION = 99
-)
-
-/*
-[RouterInfo]
-Accurate for version 0.9.49
-
-Description
-Defines all of the data that a router wants to public for the network to see. The
-RouterInfo is one of two structures stored in the network database (the other being
-LeaseSet), and is keyed under the SHA256 of the contained RouterIdentity.
-
-Contents
-RouterIdentity followed by the Date, when the entry was published
-
-+----+----+----+----+----+----+----+----+
-| router_ident                          |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| published                             |
-+----+----+----+----+----+----+----+----+
-|size| RouterAddress 0                  |
-+----+                                  +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| RouterAddress 1                       |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+----+----+----+----+
-| RouterAddress ($size-1)               |
-+                                       +
-|                                       |
-~                                       ~
-~                                       ~
-|                                       |
-+----+----+----+----+-//-+----+----+----+
-|psiz| options                          |
-+----+----+----+----+-//-+----+----+----+
-| signature                             |
-+                                       +
-|                                       |
-+                                       +
-|                                       |
-+                                       +
-|                                       |
-+                                       +
-|                                       |
-+----+----+----+----+----+----+----+----+
-
-router_ident :: RouterIdentity
-                length -> >= 387 bytes
-
-published :: Date
-             length -> 8 bytes
-
-size :: Integer
-        length -> 1 byte
-        The number of RouterAddresses to follow, 0-255
-
-addresses :: [RouterAddress]
-             length -> varies
-
-peer_size :: Integer
-             length -> 1 byte
-             The number of peer Hashes to follow, 0-255, unused, always zero
-             value -> 0
-
-options :: Mapping
-
-signature :: Signature
-             length -> 40 bytes
-*/
-
-// RouterInfo is the represenation of an I2P RouterInfo.
-//
-// https://geti2p.net/spec/common-structures#routerinfo
-type RouterInfo struct {
-	router_identity RouterIdentity
-	published       *Date
-	size            *Integer
-	addresses       []*RouterAddress
-	peer_size       *Integer
-	options         *Mapping
-	signature       *Signature
-}
-
-// Bytes returns the RouterInfo as a []byte suitable for writing to a stream.
-func (router_info RouterInfo) Bytes() (bytes []byte, err error) {
-	bytes = append(bytes, router_info.router_identity.KeysAndCert.Bytes()...)
-	bytes = append(bytes, router_info.published.Bytes()...)
-	bytes = append(bytes, router_info.size.Bytes()...)
-	for _, router_address := range router_info.addresses {
-		bytes = append(bytes, router_address.Bytes()...)
-	}
-	bytes = append(bytes, router_info.peer_size.Bytes()...)
-	bytes = append(bytes, router_info.options.Data()...)
-	bytes = append(bytes, []byte(*router_info.signature)...)
-
-	return bytes, err
-}
-
-func (router_info RouterInfo) String() string {
-	str := "Certificate: " + string(router_info.router_identity.KeysAndCert.Bytes())
-	str += "Published: " + string(router_info.published.Bytes())
-	str += "Addresses:" + string(router_info.size.Bytes())
-	for index, router_address := range router_info.addresses {
-		str += "Address " + strconv.Itoa(index) + ": " + router_address.String()
-	}
-	str += "Peer Size: " + string(router_info.peer_size.Bytes())
-	str += "Options: " + string(router_info.options.Data())
-	str += "Signature: " + string([]byte(*router_info.signature))
-	return str
-}
-
-// RouterIdentity returns the router identity as *RouterIdentity.
-func (router_info *RouterInfo) RouterIdentity() *RouterIdentity {
-	return &router_info.router_identity
-}
-
-// IndentHash returns the identity hash (sha256 sum) for this RouterInfo.
-func (router_info *RouterInfo) IdentHash() Hash {
-	data, _ := router_info.RouterIdentity().KeyCertificate.Data()
-	return HashData(data)
-}
-
-// Published returns the date this RouterInfo was published as an I2P Date.
-func (router_info *RouterInfo) Published() *Date {
-	return router_info.published
-}
-
-// RouterAddressCount returns the count of RouterAddress in this RouterInfo as a Go integer.
-func (router_info *RouterInfo) RouterAddressCount() int {
-	return router_info.size.Int()
-}
-
-// RouterAddresses returns all RouterAddresses for this RouterInfo as []*RouterAddress.
-func (router_info *RouterInfo) RouterAddresses() []*RouterAddress {
-	return router_info.addresses
-}
-
-// PeerSize returns the peer size as a Go integer.
-func (router_info *RouterInfo) PeerSize() int {
-	// Peer size is unused:
-	// https://geti2p.net/spec/common-structures#routeraddress
-	return 0
-}
-
-// Options returns the options for this RouterInfo as an I2P Mapping.
-func (router_info RouterInfo) Options() (mapping Mapping) {
-	return *router_info.options
-}
-
-// Signature returns the signature for this RouterInfo as an I2P Signature.
-func (router_info RouterInfo) Signature() (signature Signature) {
-	return *router_info.signature
-}
-
-// Network implements net.Addr
-func (router_info RouterInfo) Network() string {
-	return "i2p"
-}
-
-// ReadRouterInfo returns RouterInfo from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadRouterInfo(bytes []byte) (info RouterInfo, remainder []byte, err error) {
-	info.router_identity, remainder, err = ReadRouterIdentity(bytes)
-	if err != nil {
-		log.WithFields(log.Fields{
-			"at":           "(RouterInfo) ReadRouterInfo",
-			"data_len":     len(bytes),
-			"required_len": ROUTER_INFO_MIN_SIZE,
-			"reason":       "not enough data",
-		}).Error("error parsing router info")
-		err = errors.New("error parsing router info: not enough data")
-		return
-	}
-	info.published, remainder, err = NewDate(remainder)
-	if err != nil {
-		log.WithFields(log.Fields{
-			"at":           "(RouterInfo) ReadRouterInfo",
-			"data_len":     len(remainder),
-			"required_len": DATE_SIZE,
-			"reason":       "not enough data",
-		}).Error("error parsing router info")
-		err = errors.New("error parsing router info: not enough data")
-	}
-	info.size, remainder, err = NewInteger(remainder, 1)
-	if err != nil {
-		log.WithFields(log.Fields{
-			"at":           "(RouterInfo) ReadRouterInfo",
-			"data_len":     len(remainder),
-			"required_len": info.size.Int(),
-			"reason":       "read error",
-		}).Error("error parsing router info size")
-	}
-	for i := 0; i < info.size.Int(); i++ {
-		address, more, err := ReadRouterAddress(remainder)
-		remainder = more
-		if err != nil {
-			log.WithFields(log.Fields{
-				"at":       "(RouterInfo) ReadRouterInfo",
-				"data_len": len(remainder),
-				//"required_len": ROUTER_ADDRESS_SIZE,
-				"reason": "not enough data",
-			}).Error("error parsing router address")
-			err = errors.New("error parsing router info: not enough data")
-		}
-		info.addresses = append(info.addresses, &address)
-	}
-	info.peer_size, remainder, err = NewInteger(remainder, 1)
-	var errs []error
-	info.options, remainder, errs = NewMapping(remainder)
-	if len(errs) != 0 {
-		log.WithFields(log.Fields{
-			"at":       "(RouterInfo) ReadRouterInfo",
-			"data_len": len(remainder),
-			//"required_len": MAPPING_SIZE,
-			"reason": "not enough data",
-		}).Error("error parsing router info")
-		estring := ""
-		for _, e := range errs {
-			estring += e.Error() + " "
-		}
-		err = errors.New("error parsing router info: " + estring)
-	}
-	info.signature, remainder, err = NewSignature(remainder)
-	if err != nil {
-		log.WithFields(log.Fields{
-			"at":       "(RouterInfo) ReadRouterInfo",
-			"data_len": len(remainder),
-			//"required_len": MAPPING_SIZE,
-			"reason": "not enough data",
-		}).Error("error parsing router info")
-		err = errors.New("error parsing router info: not enough data")
-	}
-	return
-}
-
-func (router_info *RouterInfo) RouterCapabilities() string {
-	str, err := ToI2PString("caps")
-	if err != nil {
-		return ""
-	}
-	return string(router_info.options.Values().Get(str))
-}
-
-func (router_info *RouterInfo) RouterVersion() string {
-	str, err := ToI2PString("router.version")
-	if err != nil {
-		return ""
-	}
-	return string(router_info.options.Values().Get(str))
-}
-
-func (router_info *RouterInfo) GoodVersion() bool {
-	version := router_info.RouterVersion()
-	v := strings.Split(version, ".")
-	if len(v) != 3 {
-		return false
-	}
-	if v[0] == "0" {
-		if v[1] == "9" {
-			val, _ := strconv.Atoi(v[2])
-			if val >= MIN_GOOD_VERSION && val <= MAX_GOOD_VERSION {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-func (router_info *RouterInfo) UnCongested() bool {
-	caps := router_info.RouterCapabilities()
-	if strings.Contains(caps, "K") {
-		return false
-	}
-	if strings.Contains(caps, "G") {
-		return false
-	}
-	if strings.Contains(caps, "E") {
-		return false
-	}
-	return true
-}
-
-func (router_info *RouterInfo) Reachable() bool {
-	caps := router_info.RouterCapabilities()
-	if strings.Contains(caps, "U") {
-		return false
-	}
-	return strings.Contains(caps, "R")
-}

lib/common/router_info/router_info_test.go

@@ -1,209 +0,0 @@
-package router_info
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-
-	common "github.com/go-i2p/go-i2p/lib/common/data"
-	"github.com/go-i2p/go-i2p/lib/common/router_address"
-	"github.com/go-i2p/go-i2p/lib/common/router_identity"
-	"github.com/stretchr/testify/assert"
-)
-
-func buildRouterIdentity() router_identity.RouterIdentity {
-	router_ident_data := make([]byte, 128+256)
-	router_ident_data = append(router_ident_data, []byte{0x05, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00}...)
-	return_data, _, _ := router_identity.ReadRouterIdentity(router_ident_data)
-	return return_data
-}
-
-func buildDate() []byte {
-	date_data := []byte{0x00, 0x00, 0x00, 0x00, 0x05, 0x26, 0x5c, 0x00}
-	return date_data
-}
-
-func buildMapping() *common.Mapping {
-	mapping, _ := common.GoMapToMapping(map[string]string{"host": "127.0.0.1", "port": "4567"})
-	return mapping
-}
-
-func buildRouterAddress(transport string) router_address.RouterAddress {
-	router_address_bytes := []byte{0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-	str, _ := common.ToI2PString(transport)
-	router_address_bytes = append(router_address_bytes, []byte(str)...)
-	router_address_bytes = append(router_address_bytes, buildMapping().Data()...)
-	return_data, _, _ := router_address.ReadRouterAddress(router_address_bytes)
-	return return_data
-}
-
-func buildFullRouterInfo(rid ...[]byte) (RouterInfo, error) {
-	var ri RouterInfo
-	var err error
-	if rid == nil || len(rid) == 0 {
-		router_info_data := make([]byte, 0)
-		router_info_data = append(router_info_data, buildRouterIdentity().KeysAndCert.Bytes()...)
-		router_info_data = append(router_info_data, buildDate()...)
-		router_info_data = append(router_info_data, 0x01)
-		router_info_data = append(router_info_data, buildRouterAddress("foo").Bytes()...)
-		router_info_data = append(router_info_data, 0x00)
-		router_info_data = append(router_info_data, buildMapping().Data()...)
-		router_info_data = append(router_info_data, make([]byte, 40)...)
-		ri, _, err = ReadRouterInfo(router_info_data)
-	} else {
-		ri, _, err = ReadRouterInfo(rid[0])
-	}
-	return ri, err
-}
-
-func TestPublishedReturnsCorrectDate(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, _ := buildFullRouterInfo()
-	date := router_info.Published()
-	assert.Equal(int64(86400), date.Time().Unix(), "RouterInfo.Published() did not return correct date")
-}
-
-func TestPublishedReturnsCorrectErrorWithPartialDate(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, err := buildFullRouterInfo()
-	assert.Nil(err)
-	bytes, err := router_info.Bytes()
-	router_info, err = buildFullRouterInfo(bytes[:387+4])
-	//_ := router_info.Published()
-	if assert.NotNil(err) {
-		assert.Equal("error parsing date: not enough data", err.Error())
-	}
-}
-
-func TestPublishedReturnsCorrectErrorWithInvalidData(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, err := buildFullRouterInfo()
-	if assert.Nil(err) {
-		bytes, err := router_info.Bytes()
-		router_info, err = buildFullRouterInfo(bytes[:56])
-		if assert.NotNil(err) {
-			assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
-		}
-	} else {
-		assert.Fail("error building router info")
-	}
-}
-
-func TestRouterAddressCountReturnsCorrectCount(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, _ := buildFullRouterInfo()
-	count := router_info.RouterAddressCount()
-	assert.Equal(1, count, "RouterInfo.RouterAddressCount() did not return correct count")
-}
-
-func TestRouterAddressCountReturnsCorrectErrorWithInvalidData(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, err := buildFullRouterInfo()
-	if assert.Nil(err) {
-		bytes, err := router_info.Bytes()
-		router_info, err = buildFullRouterInfo(bytes[:387+8])
-
-		count := router_info.RouterAddressCount()
-		if assert.NotNil(err) {
-			assert.Equal("error parsing router addresses: not enough data", err.Error())
-		}
-		assert.Equal(0, count)
-	}
-}
-
-func TestRouterAddressesReturnsAddresses(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, err := buildFullRouterInfo()
-	router_addresses := router_info.RouterAddresses()
-	assert.Nil(err)
-	if assert.Equal(1, len(router_addresses)) {
-		assert.Equal(
-			0,
-			bytes.Compare(
-				[]byte(buildRouterAddress("foo").Bytes()),
-				[]byte(router_addresses[0].Bytes()),
-			),
-		)
-	}
-}
-
-func TestRouterAddressesReturnsAddressesWithMultiple(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info_data := make([]byte, 0)
-	router_info_data = append(router_info_data, buildRouterIdentity().KeysAndCert.Bytes()...)
-	router_info_data = append(router_info_data, buildDate()...)
-	router_info_data = append(router_info_data, 0x03)
-	router_info_data = append(router_info_data, buildRouterAddress("foo0").Bytes()...)
-	router_info_data = append(router_info_data, buildRouterAddress("foo1").Bytes()...)
-	router_info_data = append(router_info_data, buildRouterAddress("foo2").Bytes()...)
-	router_info_data = append(router_info_data, 0x00)
-	router_info_data = append(router_info_data, buildMapping().Data()...)
-	router_info_data = append(router_info_data, make([]byte, 40)...)
-	router_info, _, _ := ReadRouterInfo(router_info_data)
-
-	count := router_info.RouterAddressCount()
-	if assert.Equal(3, count) {
-		router_addresses := router_info.RouterAddresses()
-		for i := 0; i < 3; i++ {
-			assert.Equal(
-				0,
-				bytes.Compare(
-					[]byte(buildRouterAddress(fmt.Sprintf("foo%d", i)).Bytes()),
-					[]byte(router_addresses[i].Bytes()),
-				),
-			)
-		}
-	}
-}
-
-func TestPeerSizeIsZero(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, _ := buildFullRouterInfo()
-	size := router_info.PeerSize()
-	assert.Equal(0, size, "RouterInfo.PeerSize() did not return 0")
-}
-
-func TestOptionsAreCorrect(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, _ := buildFullRouterInfo()
-	options := router_info.Options()
-	assert.Equal(
-		0,
-		bytes.Compare(
-			[]byte(buildMapping().Data()),
-			[]byte(options.Data()),
-		),
-	)
-}
-
-func TestSignatureIsCorrectSize(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, _ := buildFullRouterInfo()
-	signature := router_info.Signature()
-	assert.Equal(40, len(signature))
-}
-
-func TestRouterIdentityIsCorrect(t *testing.T) {
-	assert := assert.New(t)
-
-	router_info, _ := buildFullRouterInfo()
-	router_identity := router_info.RouterIdentity()
-	// assert.Nil(err)
-	assert.Equal(
-		0,
-		bytes.Compare(
-			[]byte(buildRouterIdentity().KeysAndCert.Bytes()),
-			[]byte(router_identity.KeysAndCert.Bytes()),
-		),
-	)
-}

lib/common/router_info_test.go

@@ -0,0 +1,195 @@
+package common
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func buildRouterIdentity() RouterIdentity {
+	router_ident_data := make([]byte, 128+256)
+	router_ident_data = append(router_ident_data, []byte{0x05, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00}...)
+	b, _, err := ReadRouterIdentity(router_ident_data)
+	if err != nil {
+		panic(err)
+	}
+	return b
+}
+
+func buildDate() []byte {
+	date_data := []byte{0x00, 0x00, 0x00, 0x00, 0x05, 0x26, 0x5c, 0x00}
+	return date_data
+}
+
+func buildMapping() Mapping {
+	mapping, _ := GoMapToMapping(map[string]string{"host": "127.0.0.1", "port": "4567"})
+	return mapping
+}
+
+func buildRouterAddress(transport string) RouterAddress {
+	router_address_bytes := []byte{0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+	str, _ := ToI2PString(transport)
+	router_address_bytes = append(router_address_bytes, []byte(str)...)
+	router_address_bytes = append(router_address_bytes, buildMapping()...)
+	return RouterAddress(router_address_bytes)
+}
+
+func buildFullRouterInfo() RouterInfo {
+	router_info_data := make([]byte, 0)
+	router_info_data = append(router_info_data, buildRouterIdentity().Bytes()...)
+	router_info_data = append(router_info_data, buildDate()...)
+	router_info_data = append(router_info_data, 0x01)
+	router_info_data = append(router_info_data, buildRouterAddress("foo")...)
+	router_info_data = append(router_info_data, 0x00)
+	router_info_data = append(router_info_data, buildMapping()...)
+	router_info_data = append(router_info_data, make([]byte, 40)...)
+	return RouterInfo(router_info_data)
+}
+
+func TestPublishedReturnsCorrectDate(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	date, err := router_info.Published()
+	assert.Nil(err)
+	assert.Equal(int64(86400), date.Time().Unix(), "RouterInfo.Published() did not return correct date")
+}
+
+func TestPublishedReturnsCorrectErrorWithPartialDate(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	router_info = router_info[:387+4]
+	_, err := router_info.Published()
+	if assert.NotNil(err) {
+		assert.Equal("error parsing date: not enough data", err.Error())
+	}
+}
+
+func TestPublishedReturnsCorrectErrorWithInvalidData(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	router_info = router_info[:56]
+	_, err := router_info.Published()
+	if assert.NotNil(err) {
+		assert.Equal("error parsing KeysAndCert: data is smaller than minimum valid size", err.Error())
+	}
+}
+
+func TestRouterAddressCountReturnsCorrectCount(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	count, err := router_info.RouterAddressCount()
+	assert.Nil(err)
+	assert.Equal(1, count, "RouterInfo.RouterAddressCount() did not return correct count")
+}
+
+func TestRouterAddressCountReturnsCorrectErrorWithInvalidData(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	router_info = router_info[:387+8]
+	count, err := router_info.RouterAddressCount()
+	if assert.NotNil(err) {
+		assert.Equal("error parsing router addresses: not enough data", err.Error())
+	}
+	assert.Equal(0, count)
+}
+
+func TestRouterAddressesReturnsAddresses(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	router_addresses, err := router_info.RouterAddresses()
+	assert.Nil(err)
+	if assert.Equal(1, len(router_addresses)) {
+		assert.Equal(
+			0,
+			bytes.Compare(
+				[]byte(buildRouterAddress("foo")),
+				[]byte(router_addresses[0]),
+			),
+		)
+	}
+}
+
+func TestRouterAddressesReturnsAddressesWithMultiple(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info_data := make([]byte, 0)
+	router_info_data = append(router_info_data, buildRouterIdentity().Bytes()...)
+	router_info_data = append(router_info_data, buildDate()...)
+	router_info_data = append(router_info_data, 0x03)
+	router_info_data = append(router_info_data, buildRouterAddress("foo0")...)
+	router_info_data = append(router_info_data, buildRouterAddress("foo1")...)
+	router_info_data = append(router_info_data, buildRouterAddress("foo2")...)
+	router_info_data = append(router_info_data, 0x00)
+	router_info_data = append(router_info_data, buildMapping()...)
+	router_info_data = append(router_info_data, make([]byte, 40)...)
+	router_info := RouterInfo(router_info_data)
+
+	count, err := router_info.RouterAddressCount()
+	if assert.Equal(3, count) && assert.Nil(err) {
+		router_addresses, err := router_info.RouterAddresses()
+		if assert.Nil(err) {
+			for i := 0; i < 3; i++ {
+				assert.Equal(
+					0,
+					bytes.Compare(
+						[]byte(buildRouterAddress(fmt.Sprintf("foo%d", i))),
+						[]byte(router_addresses[i]),
+					),
+				)
+			}
+		}
+	}
+
+}
+
+func TestPeerSizeIsZero(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	size := router_info.PeerSize()
+	assert.Equal(0, size, "RouterInfo.PeerSize() did not return 0")
+}
+
+func TestOptionsAreCorrect(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	options := router_info.Options()
+	assert.Equal(
+		0,
+		bytes.Compare(
+			[]byte(buildMapping()),
+			[]byte(options),
+		),
+	)
+}
+
+func TestSignatureIsCorrectSize(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	signature := router_info.Signature()
+	assert.Equal(40, len(signature))
+}
+
+func TestRouterIdentityIsCorrect(t *testing.T) {
+	assert := assert.New(t)
+
+	router_info := buildFullRouterInfo()
+	router_identity, err := router_info.RouterIdentity()
+	assert.Nil(err)
+	assert.Equal(
+		0,
+		bytes.Compare(
+			[]byte(buildRouterIdentity().Bytes()),
+			[]byte(router_identity.Bytes()),
+		),
+	)
+}

lib/common/session_key.go

@@ -0,0 +1,3 @@
+package common
+
+type SessionKey [32]byte

lib/common/session_key/doc.md

@@ -1,34 +0,0 @@
-# session_key
---
-    import "github.com/go-i2p/go-i2p/lib/common/session_key"
-
-Package session_key implements the I2P SessionKey common data structure
-
-## Usage
-
-#### type SessionKey
-
-```go
-type SessionKey [32]byte
-```
-
-SessionKey is the represenation of an I2P SessionKey.
-
-https://geti2p.net/spec/common-structures#sessionkey
-
-#### func  NewSessionKey
-
-```go
-func NewSessionKey(data []byte) (session_key *SessionKey, remainder []byte, err error)
-```
-NewSessionKey creates a new *SessionKey from []byte using ReadSessionKey.
-Returns a pointer to SessionKey unlike ReadSessionKey.
-
-#### func  ReadSessionKey
-
-```go
-func ReadSessionKey(bytes []byte) (info SessionKey, remainder []byte, err error)
-```
-ReadSessionKey returns SessionKey from a []byte. The remaining bytes after the
-specified length are also returned. Returns a list of errors that occurred
-during parsing.

lib/common/session_key/session_key.go

@@ -1,34 +0,0 @@
-// Package session_key implements the I2P SessionKey common data structure
-package session_key
-
-/*
-[SessionKey]
-Accurate for version 0.9.49
-
-Description
-This structure is used for symmetric AES256 encryption and decryption.
-
-Contents
-32 bytes
-*/
-
-// SessionKey is the represenation of an I2P SessionKey.
-//
-// https://geti2p.net/spec/common-structures#sessionkey
-type SessionKey [32]byte
-
-// ReadSessionKey returns SessionKey from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadSessionKey(bytes []byte) (info SessionKey, remainder []byte, err error) {
-	// TODO: stub
-	return
-}
-
-// NewSessionKey creates a new *SessionKey from []byte using ReadSessionKey.
-// Returns a pointer to SessionKey unlike ReadSessionKey.
-func NewSessionKey(data []byte) (session_key *SessionKey, remainder []byte, err error) {
-	sessionKey, remainder, err := ReadSessionKey(data)
-	session_key = &sessionKey
-	return
-}

lib/common/session_tag.go

@@ -0,0 +1,3 @@
+package common
+
+type SessionTag [32]byte

lib/common/session_tag/doc.md

@@ -1,34 +0,0 @@
-# session_tag
---
-    import "github.com/go-i2p/go-i2p/lib/common/session_tag"
-
-Package session_tag implements the I2P SessionTag common data structure
-
-## Usage
-
-#### type SessionTag
-
-```go
-type SessionTag [32]byte
-```
-
-SessionTag is the represenation of an I2P SessionTag.
-
-https://geti2p.net/spec/common-structures#session-tag
-
-#### func  NewSessionTag
-
-```go
-func NewSessionTag(data []byte) (session_tag *SessionTag, remainder []byte, err error)
-```
-NewSessionTag creates a new *SessionTag from []byte using ReadSessionTag.
-Returns a pointer to SessionTag unlike ReadSessionTag.
-
-#### func  ReadSessionTag
-
-```go
-func ReadSessionTag(bytes []byte) (info SessionTag, remainder []byte, err error)
-```
-ReadSessionTag returns SessionTag from a []byte. The remaining bytes after the
-specified length are also returned. Returns a list of errors that occurred
-during parsing.

lib/common/session_tag/session_tag.go

@@ -1,34 +0,0 @@
-// Package session_tag implements the I2P SessionTag common data structure
-package session_tag
-
-/*
-[SessionKey]
-Accurate for version 0.9.49
-
-Description
-A random number
-
-Contents
-32 bytes
-*/
-
-// SessionTag is the represenation of an I2P SessionTag.
-//
-// https://geti2p.net/spec/common-structures#session-tag
-type SessionTag [32]byte
-
-// ReadSessionTag returns SessionTag from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadSessionTag(bytes []byte) (info SessionTag, remainder []byte, err error) {
-	// TODO: stub
-	return
-}
-
-// NewSessionTag creates a new *SessionTag from []byte using ReadSessionTag.
-// Returns a pointer to SessionTag unlike ReadSessionTag.
-func NewSessionTag(data []byte) (session_tag *SessionTag, remainder []byte, err error) {
-	sessionTag, remainder, err := ReadSessionTag(data)
-	session_tag = &sessionTag
-	return
-}

lib/common/signature.go

@@ -0,0 +1,3 @@
+package common
+
+type Signature []byte

lib/common/signature/doc.md

@@ -1,50 +0,0 @@
-# signature
---
-    import "github.com/go-i2p/go-i2p/lib/common/signature"
-
-Package signature implements the I2P Signature common data structure
-
-## Usage
-
-```go
-const (
-	DSA_SHA1_SIZE               = 40
-	ECDSA_SHA256_P256_SIZE      = 64
-	ECDSA_SHA384_P384_SIZE      = 96
-	ECDSA_SHA512_P512_SIZE      = 132
-	RSA_SHA256_2048_SIZE        = 256
-	RSA_SHA384_3072_SIZE        = 384
-	RSA_SHA512_4096_SIZE        = 512
-	EdDSA_SHA512_Ed25519_SIZE   = 64
-	EdDSA_SHA512_Ed25519ph_SIZE = 64
-	RedDSA_SHA512_Ed25519_SIZE  = 64
-)
-```
-Lengths of signature keys
-
-#### type Signature
-
-```go
-type Signature []byte
-```
-
-Signature is the represenation of an I2P Signature.
-
-https://geti2p.net/spec/common-structures#signature
-
-#### func  NewSignature
-
-```go
-func NewSignature(data []byte) (session_tag *Signature, remainder []byte, err error)
-```
-NewSignature creates a new *Signature from []byte using ReadSignature. Returns a
-pointer to Signature unlike ReadSignature.
-
-#### func  ReadSignature
-
-```go
-func ReadSignature(bytes []byte) (info Signature, remainder []byte, err error)
-```
-ReadSignature returns Signature from a []byte. The remaining bytes after the
-specified length are also returned. Returns a list of errors that occurred
-during parsing.

lib/common/signature/signature.go

@@ -1,49 +0,0 @@
-// Package signature implements the I2P Signature common data structure
-package signature
-
-// Lengths of signature keys
-const (
-	DSA_SHA1_SIZE               = 40
-	ECDSA_SHA256_P256_SIZE      = 64
-	ECDSA_SHA384_P384_SIZE      = 96
-	ECDSA_SHA512_P512_SIZE      = 132
-	RSA_SHA256_2048_SIZE        = 256
-	RSA_SHA384_3072_SIZE        = 384
-	RSA_SHA512_4096_SIZE        = 512
-	EdDSA_SHA512_Ed25519_SIZE   = 64
-	EdDSA_SHA512_Ed25519ph_SIZE = 64
-	RedDSA_SHA512_Ed25519_SIZE  = 64
-)
-
-/*
-[Signature]
-Accurate for version 0.9.49
-
-Description
-This structure represents the signature of some data.
-
-Contents
-Signature type and length are inferred from the type of key used. The default type is
-DSA_SHA1. As of release 0.9.12, other types may be supported, depending on context.
-*/
-
-// Signature is the represenation of an I2P Signature.
-//
-// https://geti2p.net/spec/common-structures#signature
-type Signature []byte
-
-// ReadSignature returns Signature from a []byte.
-// The remaining bytes after the specified length are also returned.
-// Returns a list of errors that occurred during parsing.
-func ReadSignature(bytes []byte) (info Signature, remainder []byte, err error) {
-	// TODO: stub
-	return
-}
-
-// NewSignature creates a new *Signature from []byte using ReadSignature.
-// Returns a pointer to Signature unlike ReadSignature.
-func NewSignature(data []byte) (session_tag *Signature, remainder []byte, err error) {
-	sessionTag, remainder, err := ReadSignature(data)
-	session_tag = &sessionTag
-	return
-}

lib/common/string.go

@@ -0,0 +1,115 @@
+package common
+
+/*
+I2P String
+https://geti2p.net/spec/common-structures#string
+Accurate for version 0.9.24
+*/
+
+import (
+	"errors"
+	log "github.com/sirupsen/logrus"
+)
+
+// Maximum number of bytes that can be stored in an I2P string
+const (
+	STRING_MAX_SIZE = 255
+)
+
+type String []byte
+
+//
+// Look up the length of the string, reporting errors if the string is
+// invalid or the specified length does not match the provided data.
+//
+func (str String) Length() (length *Integer, err error) {
+	if len(str) == 0 {
+		log.WithFields(log.Fields{
+			"at":     "(String) Length",
+			"reason": "no data",
+		}).Error("error parsing string")
+		err = errors.New("error parsing string: zero length")
+		return
+	}
+	length, err = NewInteger([]byte{byte(str[0])})
+	inferred_len := length.Value() + 1
+	str_len := len(str)
+	if inferred_len > str_len {
+		log.WithFields(log.Fields{
+			"at":                    "(String) Length",
+			"string_bytes_length":   str_len,
+			"string_length_field":   length,
+			"expected_bytes_length": inferred_len,
+			"reason":                "data shorter than specified",
+		}).Warn("string format warning")
+		err = errors.New("string parsing warning: string data is shorter than specified by length")
+	} else if str_len > inferred_len {
+		log.WithFields(log.Fields{
+			"at":                    "(String) Length",
+			"string_bytes_length":   str_len,
+			"string_length_field":   length,
+			"expected_bytes_length": inferred_len,
+			"reason":                "data longer than specified",
+		}).Warn("string format warning")
+		err = errors.New("string parsing warning: string contains data beyond length")
+	}
+	return
+}
+
+//
+// Return the string data and any errors encountered by Length.
+//
+func (str String) Data() (data string, err error) {
+	length, err := str.Length()
+	if err != nil {
+		switch err.Error() {
+		case "error parsing string: zero length":
+			return
+		case "string parsing warning: string data is shorter than specified by length":
+			data = string(str[1:])
+			return
+		case "string parsing warning: string contains data beyond length":
+			data = string(str[1 : length.Value()+1])
+			return
+		}
+	}
+	data = string(str[1:])
+	return
+}
+
+//
+// This function takes an unformatted Go string and returns a String
+// and any errors encountered during the encoding.
+//
+func ToI2PString(data string) (str String, err error) {
+	data_len := len(data)
+	if data_len > STRING_MAX_SIZE {
+		log.WithFields(log.Fields{
+			"at":         "ToI2PString",
+			"string_len": data_len,
+			"max_len":    STRING_MAX_SIZE,
+			"reason":     "too much data",
+		}).Error("cannot create I2P string")
+		err = errors.New("cannot store that much data in I2P string")
+		return
+	}
+	i2p_string := []byte{byte(data_len)}
+	i2p_string = append(i2p_string, []byte(data)...)
+	str = String(i2p_string)
+	return
+}
+
+//
+// Read a string from a slice of bytes, returning any extra data on the end
+// of the slice and any errors encountered parsing the String.
+//
+func ReadString(data []byte) (str String, remainder []byte, err error) {
+	str = String(data)
+	length, err := String(data).Length()
+	if err != nil && err.Error() == "string parsing warning: string contains data beyond length" {
+		str = String(data[:length.Value()+1])
+		remainder = data[length.Value()+1:]
+		err = nil
+	}
+	return
+}

lib/common/string_test.go

@@ -1,24 +1,23 @@
-package data
+package common
 
 import (
-	"testing"
-
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestStringReportsCorrectLength(t *testing.T) {
 	assert := assert.New(t)
 
-	str_len, err := I2PString([]byte{0x02, 0x00, 0x00}).Length()
+	str_len, err := String([]byte{0x02, 0x00, 0x00}).Length()
 
 	assert.Equal(str_len, 2, "Length() did not report correct length")
 	assert.Nil(err, "Length() reported an error on valid string")
 }
 
-func TestI2PStringReportsLengthZeroError(t *testing.T) {
+func TestStringReportsLengthZeroError(t *testing.T) {
 	assert := assert.New(t)
 
-	str_len, err := I2PString(make([]byte, 0)).Length()
+	str_len, err := String(make([]byte, 0)).Length()
 
 	assert.Equal(str_len, 0, "Length() reported non-zero length on empty slice")
 	if assert.NotNil(err) {
@@ -26,10 +25,10 @@ func TestI2PStringReportsLengthZeroError(t *testing.T) {
 	}
 }
 
-func TestI2PStringReportsExtraDataError(t *testing.T) {
+func TestStringReportsExtraDataError(t *testing.T) {
 	assert := assert.New(t)
 
-	str_len, err := I2PString([]byte{0x01, 0x00, 0x00}).Length()
+	str_len, err := String([]byte{0x01, 0x00, 0x00}).Length()
 
 	assert.Equal(str_len, 1, "Length() reported wrong size when extra data present")
 	if assert.NotNil(err) {
@@ -37,10 +36,10 @@ func TestI2PStringReportsExtraDataError(t *testing.T) {
 	}
 }
 
-func TestI2PStringDataReportsLengthZeroError(t *testing.T) {
+func TestStringDataReportsLengthZeroError(t *testing.T) {
 	assert := assert.New(t)
 
-	str_len, err := I2PString([]byte{0x01}).Length()
+	str_len, err := String([]byte{0x01}).Length()
 
 	assert.Equal(str_len, 1, "Length() reported wrong size with missing data")
 	if assert.NotNil(err) {
@@ -48,10 +47,10 @@ func TestI2PStringDataReportsLengthZeroError(t *testing.T) {
 	}
 }
 
-func TestI2PStringDataReportsExtraDataError(t *testing.T) {
+func TestStringDataReportsExtraDataError(t *testing.T) {
 	assert := assert.New(t)
 
-	data, err := I2PString([]byte{0x01, 0x00, 0x01}).Data()
+	data, err := String([]byte{0x01, 0x00, 0x01}).Data()
 	data_len := len(data)
 
 	assert.Equal(data_len, 1, "Data() reported wrong size on string with extra data")
@@ -60,10 +59,10 @@ func TestI2PStringDataReportsExtraDataError(t *testing.T) {
 	}
 }
 
-func TestI2PStringDataEmptyWhenZeroLength(t *testing.T) {
+func TestStringDataEmptyWhenZeroLength(t *testing.T) {
 	assert := assert.New(t)
 
-	data, err := I2PString(make([]byte, 0)).Data()
+	data, err := String(make([]byte, 0)).Data()
 
 	assert.Equal(len(data), 0, "Data() returned data when none was present:")
 	if assert.NotNil(err) {
@@ -71,10 +70,10 @@ func TestI2PStringDataEmptyWhenZeroLength(t *testing.T) {
 	}
 }
 
-func TestI2PStringDataErrorWhenNonZeroLengthOnly(t *testing.T) {
+func TestStringDataErrorWhenNonZeroLengthOnly(t *testing.T) {
 	assert := assert.New(t)
 
-	data, err := I2PString([]byte{0x01}).Data()
+	data, err := String([]byte{0x01}).Data()
 
 	assert.Equal(len(data), 0, "Data() returned data when only length was present")
 	if assert.NotNil(err) {
@@ -82,7 +81,7 @@ func TestI2PStringDataErrorWhenNonZeroLengthOnly(t *testing.T) {
 	}
 }
 
-func TestToI2PI2PStringFormatsCorrectly(t *testing.T) {
+func TestToI2PStringFormatsCorrectly(t *testing.T) {
 	assert := assert.New(t)
 
 	i2p_string, err := ToI2PString(string([]byte{0x08, 0x09}))
@@ -112,38 +111,38 @@ func TestReadStringReadsLength(t *testing.T) {
 	assert := assert.New(t)
 
 	bytes := []byte{0x01, 0x04, 0x06}
-	str, remainder, err := ReadI2PString(bytes)
+	str, remainder, err := ReadString(bytes)
 
-	assert.Nil(err, "ReadI2PString() returned error reading string with extra data")
-	assert.Equal(len(str), 2, "ReadI2PString() did not return correct string length")
-	assert.Equal(1, int(str[0]), "ReadI2PString() did not return correct string")
-	assert.Equal(4, int(str[1]), "ReadI2PString() did not return correct string")
-	assert.Equal(len(remainder), 1, "ReadI2PString() did not return correct remainder length")
-	assert.Equal(6, int(remainder[0]), "ReadI2PString() did not return correct remainder")
+	assert.Nil(err, "ReadString() returned error reading string with extra data")
+	assert.Equal(len(str), 2, "ReadString() did not return correct string length")
+	assert.Equal(1, int(str[0]), "ReadString() did not return correct string")
+	assert.Equal(4, int(str[1]), "ReadString() did not return correct string")
+	assert.Equal(len(remainder), 1, "ReadString() did not return correct remainder length")
+	assert.Equal(6, int(remainder[0]), "ReadString() did not return correct remainder")
 }
 
-func TestReadI2PStringErrWhenEmptySlice(t *testing.T) {
+func TestReadStringErrWhenEmptySlice(t *testing.T) {
 	assert := assert.New(t)
 
 	bytes := make([]byte, 0)
-	_, _, err := ReadI2PString(bytes)
+	_, _, err := ReadString(bytes)
 
 	if assert.NotNil(err) {
 		assert.Equal(err.Error(), "error parsing string: zero length", "correct error message should be returned")
 	}
 }
 
-func TestReadI2PStringErrWhenDataTooShort(t *testing.T) {
+func TestReadStringErrWhenDataTooShort(t *testing.T) {
 	assert := assert.New(t)
 
 	short_str := []byte{0x03, 0x01}
-	str, remainder, err := ReadI2PString(short_str)
+	str, remainder, err := ReadString(short_str)
 
 	if assert.NotNil(err) {
 		assert.Equal(err.Error(), "string parsing warning: string data is shorter than specified by length", "correct error message should be returned")
 	}
-	assert.Equal(len(str), 2, "ReadI2PString() did not return the slice as string when too long")
-	assert.Equal(3, int(str[0]), "ReadI2PString() did not return the correct partial string")
-	assert.Equal(1, int(str[1]), "ReadI2PString() did not return the correct partial string")
-	assert.Equal(len(remainder), 0, "ReadI2PString() returned a remainder when the string data was too short")
+	assert.Equal(len(str), 2, "ReadString() did not return the slice as string when too long")
+	assert.Equal(3, int(str[0]), "ReadString() did not return the correct partial string")
+	assert.Equal(1, int(str[1]), "ReadString() did not return the correct partial string")
+	assert.Equal(len(remainder), 0, "ReadString() returned a remainder when the string data was too short")
 }

lib/config/doc.md

@@ -1,85 +0,0 @@
-# config
---
-    import "github.com/go-i2p/go-i2p/lib/config"
-
-
-## Usage
-
-```go
-var DefaultBootstrapConfig = BootstrapConfig{
-	LowPeerThreshold: 10,
-
-	ReseedServers: []*ReseedConfig{},
-}
-```
-default configuration for network bootstrap
-
-```go
-var DefaultNetDbConfig = NetDbConfig{
-	Path: filepath.Join(defaultConfig(), "netDb"),
-}
-```
-default settings for netdb
-
-```go
-var RouterConfigProperties = DefaultRouterConfig()
-```
-
-#### type BootstrapConfig
-
-```go
-type BootstrapConfig struct {
-	// if we have less than this many peers we should reseed
-	LowPeerThreshold int
-	// reseed servers
-	ReseedServers []*ReseedConfig
-}
-```
-
-
-#### type NetDbConfig
-
-```go
-type NetDbConfig struct {
-	// path to network database directory
-	Path string
-}
-```
-
-local network database configuration
-
-#### type ReseedConfig
-
-```go
-type ReseedConfig struct {
-	// url of reseed server
-	Url string
-	// fingerprint of reseed su3 signing key
-	SU3Fingerprint string
-}
-```
-
-configuration for 1 reseed server
-
-#### type RouterConfig
-
-```go
-type RouterConfig struct {
-	// the path to the base config directory where per-system defaults are stored
-	BaseDir string
-	// the path to the working config directory where files are changed
-	WorkingDir string
-	// netdb configuration
-	NetDb *NetDbConfig
-	// configuration for bootstrapping into the network
-	Bootstrap *BootstrapConfig
-}
-```
-
-router.config options
-
-#### func  DefaultRouterConfig
-
-```go
-func DefaultRouterConfig() *RouterConfig
-```

lib/config/netdb.go

@@ -12,5 +12,5 @@ type NetDbConfig struct {
 
 // default settings for netdb
 var DefaultNetDbConfig = NetDbConfig{
-	Path: filepath.Join(defaultConfig(), "netDb"),
+	Path: filepath.Join(".", "netDb"),
 }