checkin this tialing thingamajig and abandon this branch

fix another test
Fix key_certificate parsing/construction from data
2025-08-18 23:45:25 -04:00 · 2022-04-25 16:03:22 -04:00 · 2022-01-09 12:45:50 -05:00 · 2021-10-25 21:02:45 -04:00 · 2021-10-22 17:17:55 -04:00 · 2021-07-29 18:01:01 -04:00
398 changed files with 6687 additions and 28801 deletions
--- a/.circleci/config.yml
+++ b/.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
--- a/.github/workflows/auto-assign.yml
+++ b/.github/workflows/auto-assign.yml
@@ -1,19 +0,0 @@
-name: Auto Assign
-on:
-  issues:
-    types: [opened]
-  pull_request:
-    types: [opened]
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - name: 'Auto-assign issue'
-        uses: pozil/auto-assign-issue@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          assignees: eyedeekay
-          numOfAssignee: 1
--- a/.github/workflows/page.yml
+++ b/.github/workflows/page.yml
@@ -1,60 +0,0 @@
-name: Generate and Deploy GitHub Pages
-
-on:
-  # Run once hourly
-  schedule:
-    - cron: '0 * * * *'
-  # Allow manual trigger
-  workflow_dispatch:
-  # Run on pushes to main branch
-  push:
-    branches:
-      - main
-
-jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Fetch all history for proper repo data
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.24.x'
-          cache: true
-
-      - name: Build Site Generator
-        run: |
-          go install github.com/go-i2p/go-gh-page/cmd/github-site-gen@latest
-          export GOBIN=$(go env GOPATH)/bin
-          cp -v "$GOBIN/github-site-gen" ./github-site-gen
-          # Ensure the binary is executable
-          chmod +x github-site-gen
-
-      - name: Generate Site
-        run: |
-          # Determine current repository owner and name
-          REPO_OWNER=$(echo $GITHUB_REPOSITORY | cut -d '/' -f 1)
-          REPO_NAME=$(echo $GITHUB_REPOSITORY | cut -d '/' -f 2)
-          
-          # Generate the site
-          ./github-site-gen -repo "${REPO_OWNER}/${REPO_NAME}" -output ./site
-          
-          # Create a .nojekyll file to disable Jekyll processing
-          touch ./site/.nojekyll
-          
-          # Add a .gitattributes file to ensure consistent line endings
-          echo "* text=auto" > ./site/.gitattributes
-
-      - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          folder: site      # The folder the action should deploy
-          branch: gh-pages  # The branch the action should deploy to
-          clean: true       # Automatically remove deleted files from the deploy branch
-          commit-message: "Deploy site generated on ${{ github.sha }}"
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,89 +0,0 @@
-name: Go Tests
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.21'
-      - run: make build
-        env:
-          GO: go
-          CGO_ENABLED: 0
-
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false  # Ensure all matrix jobs run even if some fail
-      matrix:
-        test_target:
-          - "test-string-all"
-          - "test-mapping-all"
-          - "test-crypto-aes-all"
-          - "test-crypto-dsa-all"
-          - "test-crypto-ed25519-all"
-          - "test-crypto-elg-all"
-          - "test-crypto-hmac-all"
-          - "test-i2np-header-all"
-          - "test-key-cert-all"
-          - "test-keys-cert-all"
-          - "test-lease-set-all"
-          - "test-noise-transport-all"
-          - "test-router-address-all"
-          - "test-router-info-all"
-          - "test-su3-all"
-          - "test-tunnel-all"
-          - "test-base32-encode-decode-not-mangled"
-          - "test-base64-encode-decode-not-mangled"
-          - "test-lease-all"
-          - "test-date-time-from-milliseconds"
-          - "test-cert-all"
-          - "test-signatures"
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.21'  # Adjust this version as needed
-
-      - name: Cache Go modules
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Install gofumpt
-        run: go install mvdan.cc/gofumpt@latest
-
-      - name: Go mod tidy
-        run: go mod tidy
-
-      - name: Run ${{ matrix.test_target }}
-        run: make ${{ matrix.test_target }}
-        env:
-          GO: go
-          DEBUG_I2P: debug
-          CGO_ENABLED: 0
-
-      - name: Upload Test Logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.test_target }}-logs
-          path: ./test-logs/${{ matrix.test_target }}.log  # Adjust this path as needed
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,4 @@
 *.coverprofile
 *exportable-fuzz.zip
 go-i2p
-*.exe
-.idea/
-router.info
-log
-*.gv
-diff
-err
+*.exe*.log
--- a/.vscode/launch.json
+++ b/.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": [
+    
+    ]
+}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,35 +1,21 @@
 # Contributing

-Thanks for taking a look at go-i2p!  Please reach out if you have any questions or need help getting started. We have an IRC channel on IRC2P: #go-i2p-dev and we're reachable here at github.com/go-i2p also.
+Thanks for taking a look at go-i2p!  Please reach out if you have any questions or need help getting started.

-## Getting Started
+## Getting Starting

 Install required dependencies

-This example assumes Ubuntu or Debian based Linux, a reasonably modern version.
-The instructions will be similar for other Linux distributions with slightly different package managers and package names.
+This example assumes Ubuntu 16.04

 ```sh
-# For obtaining, modifying, compiling, and tracking changes to go-i2p, install:
-sudo apt-get install golang-go make git
-# If you want to generate markdown versions of the godoc locally, also install:
-go install github.com/robertkrimen/godocdown/godocdown@master
-# If you want to generate call graphs locally, also install:
-go install github.com/ofabry/go-callvis@master
+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
 ```

-On Windows, one must install the latest versions of Go and Git Bash from their respective sources.
-
-## Set up your workspace:
-
-```sh
-github_username=yourusername
-cd $(go env GOPATH)
-git clone git@github.com:$github_username/go-i2p github.com/go-i2p/go-i2p
-github.com/go-i2p/go-i2p
-```
-
-Fork go-i2p and clone it into your workspace.  Make sure you can execute `go test ./...` in the project's root directory.  At that point you should have everything you need to start making changes and opening pull requests.
+Fork go-i2p and clone it into your workspace.  Make sure you can execute `go test ./...` in the project's root directory.  At that point you should have everything you need to start making changes and opening pull requests.  If you aren't sure what to work on, take a look at some good [getting started issues](https://github.com/hkparker/go-i2p/issues?q=is%3Aopen+is%3Aissue+label%3A%22start+here%22).

 ## I2P Specifications

@@ -41,17 +27,9 @@ The I2P community maintains up-to-date [specifications](https://geti2p.net/spec)

 ## Conventions

-#### Errors
-
-We use oops to provide context to the errors we return. Do not use `errors.New` or `fmt.Errorf` when returning errors from functions. Instead, wrap raw errors in oops errors. When an error is recieved, used oops to supplement the log output.
-
-It is OK to use `fmt.Errorf` for declaring custom error types.
-
 #### Logging

-Logrus is used for logging across all of go-i2p. We have a small extension of logrus at https://github.com/go-i2p/logger which we use to add a "Fail Fast mode." We are mostly converted over to using it. 
-
-All log statements should contain an `at` fields and a `reason` field.  Here is a good example from the go-i2p implementation of a LeaseSet:
+Logrus is used for logging across all of go-i2p.  All log statements should contain an `at` fields and a `reason` field.  Here is a good example from the go-i2p implementation of a LeaseSet:

 ```go
 log.WithFields(log.Fields{
@@ -79,4 +57,4 @@ func TestRouterAddressCountReturnsCorrectCount(t *testing.T) {

 ## Pull Requests

-Pull requests should pass all tests, test all new behavior, and be correctly formatted by `gofumpt -w -s -extra` before merge.  Feel free to open incomplete pull requests and ask for help and advice.
+Pull requests should pass all tests, test all new behavior, and be correctly formatted by `gofmt` before merge.  Feel free to open incomplete pull requests if you are struggling, I will enthusiasticlly help you complete the PR in any way needed.
--- a/51
+++ b/51
@@ -1,9 +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
-export DEBUG_I2P=debug
+

 ifdef GOROOT
 	GO = $(GOROOT)/bin/go
@@ -17,52 +13,19 @@ else
 	EXE := $(REPO)/go-i2p
 endif

-#check for gofumpt
-check_gofumpt:
-	@which gofumpt > /dev/null 2>&1 || (echo "gofumpt is required but not installed. Please install it from https://github.com/mvdan/gofumpt."; exit 1)
-
 build: clean $(EXE)

 $(EXE):
-	$(GO) build --tags netgo,osusergo -v -o $(EXE)
+	$(GO) build -v -o $(EXE)

-# Include test definitions
-include doc/tests/*.mk
-
-test: 		   test-string-all \
-               test-mapping-all \
-               test-crypto-aes-all \
-               test-crypto-dsa-all \
-               test-crypto-ed25519-all \
-               test-crypto-elg-all \
-               test-crypto-hmac-all \
-               test-i2np-header-all \
-               test-key-cert-all \
-               test-keys-cert-all \
-               test-lease-set-all \
-               test-noise-transport-all \
-               test-router-address-all \
-               test-router-info-all \
-               test-su3-all \
-               test-tunnel-all \
-               test-base32-encode-decode-not-mangled \
-               test-base64-encode-decode-not-mangled \
-               test-lease-all \
-               test-date-time-from-milliseconds
+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
-
-godoc:
-	./callgraph.sh
+testcommon:
+	$(GO) test -failfast ./lib/common/...
--- a/README.md
+++ b/README.md
@@ -4,123 +4,106 @@ 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
-  - [ ] Streaming
+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
    - [ ] ECDSA_SHA384_P384
    - [ ] ECDSA_SHA512_P521
-    - [X] Ed25519
+    - [ ] Ed25519
  - Verifying
-    - [X] DSA
+    - [ ] DSA
    - [ ] ECDSA_SHA256_P256
    - [ ] ECDSA_SHA384_P384
    - [ ] ECDSA_SHA512_P521
    - [ ] RSA_SHA256_2048
    - [ ] RSA_SHA384_3072
    - [ ] RSA_SHA512_4096
-    - [X] Ed25519
-    - [ ] Red25519
-  - [X] ElGamal
-  - [X] AES256
-  - [X] X25519
-  - [X] ChaCha20/Poly1305
-  - [ ] Elligator2
-  - [ ] HKDF
-  - [X] HMAC
-  - [X] Noise subsystem
- End-to-End Crypto
-  - [ ] Garlic messages
-  - [ ] ElGamal/AES+SessionTag
-  - [ ] Ratchet/X25519
+    - [ ] Ed25519
+  - [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
-  - NTCP2
-    - [X] Handshake
-    - [ ] Session tracking
-    - [ ] Automatic session creation
-  - SSU2
+  - [ ] Transport manager
+  - NTCP
    - [ ] 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
+  - NTCP2
+    - [ ] Handshake
+    - [ ] Session tracking
+    - [ ] Automatic session creation
+  - [ ] SSU

-## Verbosity ##
-Logging can be enabled and configured using the `DEBUG_I2P` environment variable. By default, logging is disabled.
-
-There are three available log levels:
-
- Debug
-```shell
-export DEBUG_I2P=debug
-```
- Warn
-```shell
-export DEBUG_I2P=warn
-```
- Error
-```shell
-export DEBUG_I2P=error
-```
-
-If DEBUG_I2P is set to an unrecognized variable, it will fall back to "debug".
-
-## Fast-Fail mode ##
-
-Fast-Fail mode can be activated by setting `WARNFAIL_I2P` to any non-empty value. When set, every warning or error is Fatal.
-It is unsafe for production use, and intended only for debugging and testing purposes.
-
-```shell
-export WARNFAIL_I2P=true
-```
-
-If `WARNFAIL_I2P` is set and `DEBUG_I2P` is unset, `DEBUG_I2P` will be set to `debug`.

 ## Contributing

--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,41 +0,0 @@
-# go-i2p Implementation Roadmap
-
-## Transport Layer (NTCP2)
- Build on existing lib/transport/noise implementation
- Core NTCP2 components:
-  * Session handshake using noise protocol
-  * Connection management
-  * I2NP message transport
-
-## Reseed System
- SU3 file format implementation:
-  * Format parsing and validation(Much of this work is done in reseed-tools, may need to be moved here)
-  * Signature verification system(Much of this work is done in reseed-tools, may need to be moved here)
- Local reseed functionality:
-  * File-based reseed operations
- Self-signed/Package-pinned X.509 certificate handling for reseed validation
-
-## NetDb and Database Store
- Database Store message handling:
-  * Message structure implementation
-  * Message handling implementation
- NetDb core implementation:
-  * RouterInfo management
-  * LeaseSet management
-  * Lookup system
-  * Storage interface
-  * Peer selection logic?(Maybe do something very basic for now like i2pd used to do, and then improve it later, the important part will be interface design at first)
-
-## Tunnel Implementation
- Tunnel cryptography:
-  * Key generation and management
-  * Layered encryption scheme
- Message processing:
-  * Build request/response handling
-  * Gateway implementation
-  * Message forwarding logic
-
-Notes:
- Excluding legacy protocols (SSU1, NTCP1, elgamal, DSA)
- Leveraging existing noise protocol implementation
- SSU2 is not on this roadmap but is fair game for implementation as soon as NTCP2 is done. We're focused on NTCP2 to get this thing sending I2NP messages.
--- a/callgraph.sh
+++ b/callgraph.sh
@@ -1,19 +0,0 @@
-#! /usr/bin/env sh
-
-dirs=$(find lib/ -type d)
-for dir in $dirs; do
-    files=$(find "$dir" -maxdepth 2 -type f -name "*.go" -not -name "fuzz")
-    #echo "Files in $dir: $files"
-    file=$(echo $files | awk '{print $1}')
-    if [ -z "$file" ]; then
-        echo "no go files, skipping"
-        continue
-    fi
-    packageLine=$(grep -E "^package" $file)
-    package=$(echo $packageLine | awk '{print $2}')
-    echo "Generating callgraph for $package"
-    go-callvis -nostd -focus "$package" -group type -format svg -file $dir/$package "github.com/go-i2p/go-i2p/$dir"
-    godocdown -template template.md -o "$dir/README.md" "./$dir"
-    git add -v "$dir/README.md"
-    git add -v "$dir/$package.svg" "$dir/README.md"
-done
--- a/doc/tests/aes.mk
+++ b/doc/tests/aes.mk
@@ -1,17 +0,0 @@
-test-crypto-aes-all: test-crypto-aes-core test-crypto-aes-validation test-crypto-aes-padding
-
-test-crypto-aes-core:
-	$(GO) test -v ./lib/crypto -run TestAESEncryptDecrypt
-
-test-crypto-aes-validation:
-	$(GO) test -v ./lib/crypto -run TestAESEncryptInvalidKey
-	$(GO) test -v ./lib/crypto -run TestAESDecryptInvalidInput
-
-test-crypto-aes-padding:
-	$(GO) test -v ./lib/crypto -run TestPKCS7PadUnpad
-	$(GO) test -v ./lib/crypto -run TestPKCS7UnpadInvalidInput
-
-.PHONY: test-crypto-aes-all \
-        test-crypto-aes-core \
-        test-crypto-aes-validation \
-        test-crypto-aes-padding
--- a/doc/tests/base32.mk
+++ b/doc/tests/base32.mk
@@ -1,4 +0,0 @@
-test-base32-encode-decode-not-mangled:
-	$(GO) test -v ./lib/common/base32 -run TestEncodeDecodeNotMangled
-
-.PHONY: test-base32-encode-decode-not-mangled
--- a/doc/tests/base64.mk
+++ b/doc/tests/base64.mk
@@ -1,4 +0,0 @@
-test-base64-encode-decode-not-mangled:
-	$(GO) test -v ./lib/common/base64 -run TestEncodeDecodeNotMangled
-
-.PHONY: test-base64-encode-decode-not-mangled
--- a/doc/tests/build_request_record.mk
+++ b/doc/tests/build_request_record.mk
@@ -1,24 +0,0 @@
-test-build-request-all: test-build-request-receive test-build-request-ident test-build-request-components
-
-test-build-request-receive:
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordReceiveTunnel
-
-test-build-request-ident:
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordOurIdent
-
-test-build-request-components:
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordNextTunnel
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordNextIdent
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordLayerKey
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordIVKey
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordReplyKey
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordReplyIV
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordFlag
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordRequestTime
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordSendMessageID
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordPadding
-
-.PHONY: test-build-request-all \
-        test-build-request-receive \
-        test-build-request-ident \
-        test-build-request-components
--- a/doc/tests/certificate.mk
+++ b/doc/tests/certificate.mk
@@ -1,119 +0,0 @@
-test-cert-all: test-cert-type test-cert-length test-cert-data test-cert-read test-cert-length-correct test-cert-length-too-short test-cert-length-data-short test-cert-data-correct test-cert-data-too-long test-cert-data-too-short test-cert-read-correct test-cert-read-short test-cert-read-remainder test-cert-read-invalid test-cert-new-null-type test-cert-new-null-payload test-cert-new-key-type test-cert-new-invalid-type test-cert-new-payload-too-long test-cert-bytes-serialization test-cert-fields-after-creation test-cert-zero-length-payload test-cert-new-deux test-cert-invalid-payload-length test-cert-excess-bytes test-cert-serialization test-cert-serialization-excess test-cert-serialization-empty test-cert-serialization-max
-
-test-cert-type:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateTypeIsFirstByte
-
-test-cert-length:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateLength
-
-test-cert-data:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateData
-
-test-cert-read:
-	$(GO) test -v ./lib/common/certificate -run TestReadCertificate
-
-test-cert-length-correct:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateLengthCorrect
-
-test-cert-length-too-short:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateLengthErrWhenTooShort
-
-test-cert-length-data-short:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateLengthErrWhenDataTooShort
-
-test-cert-data-correct:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateDataWhenCorrectSize
-
-test-cert-data-too-long:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateDataWhenTooLong
-
-test-cert-data-too-short:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateDataWhenTooShort
-
-test-cert-read-correct:
-	$(GO) test -v ./lib/common/certificate -run TestReadCertificateWithCorrectData
-
-test-cert-read-short:
-	$(GO) test -v ./lib/common/certificate -run TestReadCertificateWithDataTooShort
-
-test-cert-read-remainder:
-	$(GO) test -v ./lib/common/certificate -run TestReadCertificateWithRemainder
-
-test-cert-read-invalid:
-	$(GO) test -v ./lib/common/certificate -run TestReadCertificateWithInvalidLength
-
-test-cert-new-null-type:
-	$(GO) test -v ./lib/common/certificate -run TestNewCertificateNullType
-
-test-cert-new-null-payload:
-	$(GO) test -v ./lib/common/certificate -run TestNewCertificateNullTypeWithPayload
-
-test-cert-new-key-type:
-	$(GO) test -v ./lib/common/certificate -run TestNewCertificateKeyType
-
-test-cert-new-invalid-type:
-	$(GO) test -v ./lib/common/certificate -run TestNewCertificateInvalidType
-
-test-cert-new-payload-too-long:
-	$(GO) test -v ./lib/common/certificate -run TestNewCertificatePayloadTooLong
-
-test-cert-bytes-serialization:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateBytesSerialization
-
-test-cert-fields-after-creation:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateFieldsAfterCreation
-
-test-cert-zero-length-payload:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateWithZeroLengthPayload
-
-test-cert-new-deux:
-	$(GO) test -v ./lib/common/certificate -run TestNewCertificateDeuxFunction
-
-test-cert-invalid-payload-length:
-	$(GO) test -v ./lib/common/certificate -run TestNewCertificateWithInvalidPayloadLength
-
-test-cert-excess-bytes:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateExcessBytes
-
-test-cert-serialization:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateSerializationDeserialization
-
-test-cert-serialization-excess:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateSerializationDeserializationWithExcessBytes
-
-test-cert-serialization-empty:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateSerializationDeserializationEmptyPayload
-
-test-cert-serialization-max:
-	$(GO) test -v ./lib/common/certificate -run TestCertificateSerializationDeserializationMaxPayload
-
-.PHONY: test-cert-all \
-        test-cert-type \
-        test-cert-length \
-        test-cert-data \
-        test-cert-read \
-        test-cert-length-correct \
-        test-cert-length-too-short \
-        test-cert-length-data-short \
-        test-cert-data-correct \
-        test-cert-data-too-long \
-        test-cert-data-too-short \
-        test-cert-read-correct \
-        test-cert-read-short \
-        test-cert-read-remainder \
-        test-cert-read-invalid \
-        test-cert-new-null-type \
-        test-cert-new-null-payload \
-        test-cert-new-key-type \
-        test-cert-new-invalid-type \
-        test-cert-new-payload-too-long \
-        test-cert-bytes-serialization \
-        test-cert-fields-after-creation \
-        test-cert-zero-length-payload \
-        test-cert-new-deux \
-        test-cert-invalid-payload-length \
-        test-cert-excess-bytes \
-        test-cert-serialization \
-        test-cert-serialization-excess \
-        test-cert-serialization-empty \
-        test-cert-serialization-max
--- a/doc/tests/date.mk
+++ b/doc/tests/date.mk
@@ -1,2 +0,0 @@
-test-date-time-from-milliseconds:
-	$(GO) test -v ./lib/common/data -run TestTimeFromMilliseconds
--- a/doc/tests/dsa.mk
+++ b/doc/tests/dsa.mk
@@ -1,20 +0,0 @@
-test-crypto-dsa-all: test-crypto-dsa test-crypto-dsa-benchmarks
-
-test-crypto-dsa:
-	$(GO) test -v ./lib/crypto -run TestDSA
-
-test-crypto-dsa-benchmarks:
-	$(GO) test -v ./lib/crypto -bench=DSA -run=^$
-
-# Individual benchmarks
-test-crypto-dsa-bench-generate:
-	$(GO) test -v ./lib/crypto -bench=DSAGenerate -run=^$
-
-test-crypto-dsa-bench-sign-verify:
-	$(GO) test -v ./lib/crypto -bench=DSASignVerify -run=^$
-
-.PHONY: test-crypto-dsa-all \
-        test-crypto-dsa \
-        test-crypto-dsa-benchmarks \
-        test-crypto-dsa-bench-generate \
-        test-crypto-dsa-bench-sign-verify
--- a/doc/tests/ed25519.mk
+++ b/doc/tests/ed25519.mk
@@ -1,7 +0,0 @@
-test-crypto-ed25519-all: test-crypto-ed25519
-
-test-crypto-ed25519:
-	$(GO) test -v ./lib/crypto -run TestEd25519
-
-.PHONY: test-crypto-ed25519-all \
-        test-crypto-ed25519
--- a/doc/tests/elg.mk
+++ b/doc/tests/elg.mk
@@ -1,24 +0,0 @@
-test-crypto-elg-all: test-crypto-elg test-crypto-elg-benchmarks
-
-test-crypto-elg:
-	$(GO) test -v ./lib/crypto -run TestElg
-
-test-crypto-elg-benchmarks:
-	$(GO) test -v ./lib/crypto -bench=Elg -run=^$
-
-# Individual benchmarks
-test-crypto-elg-bench-generate:
-	$(GO) test -v ./lib/crypto -bench=ElgGenerate -run=^$
-
-test-crypto-elg-bench-encrypt:
-	$(GO) test -v ./lib/crypto -bench=ElgEncrypt -run=^$
-
-test-crypto-elg-bench-decrypt:
-	$(GO) test -v ./lib/crypto -bench=ElgDecrypt -run=^$
-
-.PHONY: test-crypto-elg-all \
-        test-crypto-elg \
-        test-crypto-elg-benchmarks \
-        test-crypto-elg-bench-generate \
-        test-crypto-elg-bench-encrypt \
-        test-crypto-elg-bench-decrypt
--- a/doc/tests/header.mk
+++ b/doc/tests/header.mk
@@ -1,74 +0,0 @@
-
-test-i2np-header-all: test-i2np-type test-i2np-message test-i2np-expiration test-i2np-ntcp-components test-i2np-data test-i2np-regression test-i2np-build-request-record test-i2np-build-response-record test-i2np-database-lookup
-
-test-i2np-type:
-	$(GO) test -v ./lib/i2np -run TestReadI2NPTypeWith
-
-test-i2np-message:
-	$(GO) test -v ./lib/i2np -run TestReadI2NPNTCPMessageID
-
-test-i2np-expiration:
-	$(GO) test -v ./lib/i2np -run TestReadI2NPNTCPMessageExpiration
-	$(GO) test -v ./lib/i2np -run TestReadI2NPSSUMessageExpiration
-
-test-i2np-ntcp-components:
-	$(GO) test -v ./lib/i2np -run TestReadI2NPNTCPMessageSize
-	$(GO) test -v ./lib/i2np -run TestReadI2NPNTCPMessageChecksum
-
-test-i2np-data:
-	$(GO) test -v ./lib/i2np -run TestReadI2NPNTCPData
-
-test-i2np-regression:
-	$(GO) test -v ./lib/i2np -run TestCrasherRegression123781
-
-test-i2np-build-request-record:
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordReceiveTunnelTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordReceiveTunnelValidData
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordOurIdentTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadBuildRequestRecordOurIdentValidData
-
-test-i2np-build-response-record:
-	$(GO) test -v ./lib/i2np -run TestReadBuildResponseRecordHashTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadBuildResponseRecordHashValidData
-	$(GO) test -v ./lib/i2np -run TestReadBuildResponseRecordRandomDataTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadBuildResponseRecordRandomDataValidData
-	$(GO) test -v ./lib/i2np -run TestReadBuildResponseRecordReplyTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadBuildResponseRecordReplyValidData
-	$(GO) test -v ./lib/i2np -run TestReadBuildResponseRecordTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadBuildResponseRecordValidData
-
-test-i2np-database-lookup:
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupKeyTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupKeyValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupFromTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupFromValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupFlagsTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupFlagsValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupReplyTunnelIDTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupReplyTunnelIDNotIncluded
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupReplyTunnelIDValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupSizeTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupSizeValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupExcludedPeersTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupExcludedPeersZeroSize
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupExcludedPeersValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupReplyKeyTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupReplyKeyValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupTagsTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupTagsValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupReplyTagsTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupReplyTagsZeroTags
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupReplyTagsValidData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupTooLittleData
-	$(GO) test -v ./lib/i2np -run TestReadDatabaseLookupValidData
-
-.PHONY: test-i2np-header-all \
-        test-i2np-type \
-        test-i2np-message \
-        test-i2np-expiration \
-        test-i2np-ntcp-components \
-        test-i2np-data \
-        test-i2np-regression \
-        test-i2np-build-request-record \
-        test-i2np-build-response-record \
-        test-i2np-database-lookup
--- a/doc/tests/hmac.mk
+++ b/doc/tests/hmac.mk
@@ -1,7 +0,0 @@
-test-crypto-hmac-all: test-crypto-hmac
-
-test-crypto-hmac:
-	$(GO) test -v ./lib/crypto -run Test_I2PHMAC
-
-.PHONY: test-crypto-hmac-all \
-        test-crypto-hmac
--- a/doc/tests/integer.mk
+++ b/doc/tests/integer.mk
@@ -1,15 +0,0 @@
-test-integer-all: test-integer-big-endian test-integer-one-byte test-integer-zero
-
-test-integer-big-endian:
-	$(GO) test -v ./lib/common/integer -run TestIntegerBigEndian
-
-test-integer-one-byte:
-	$(GO) test -v ./lib/common/integer -run TestWorksWithOneByte
-
-test-integer-zero:
-	$(GO) test -v ./lib/common/integer -run TestIsZeroWithNoData
-
-.PHONY: test-integer-all \
-        test-integer-big-endian \
-        test-integer-one-byte \
-        test-integer-zero
--- a/doc/tests/key_certificate.mk
+++ b/doc/tests/key_certificate.mk
@@ -1,23 +0,0 @@
-test-key-cert-all: test-key-cert-signing test-key-cert-public test-key-cert-construct
-
-test-key-cert-signing:
-	$(GO) test -v ./lib/common/key_certificate -run TestSingingPublicKeyTypeReturnsCorrectInteger
-	$(GO) test -v ./lib/common/key_certificate -run TestSingingPublicKeyTypeReportsWhenDataTooSmall
-	$(GO) test -v ./lib/common/key_certificate -run TestConstructSigningPublicKeyReportsWhenDataTooSmall
-	$(GO) test -v ./lib/common/key_certificate -run TestConstructSigningPublicKeyWithDSASHA1
-	$(GO) test -v ./lib/common/key_certificate -run TestConstructSigningPublicKeyWithP256
-	$(GO) test -v ./lib/common/key_certificate -run TestConstructSigningPublicKeyWithP384
-	$(GO) test -v ./lib/common/key_certificate -run TestConstructSigningPublicKeyWithP521
-
-test-key-cert-public:
-	$(GO) test -v ./lib/common/key_certificate -run TestPublicKeyTypeReturnsCorrectInteger
-	$(GO) test -v ./lib/common/key_certificate -run TestPublicKeyTypeReportsWhenDataTooSmall
-
-test-key-cert-construct:
-	$(GO) test -v ./lib/common/key_certificate -run TestConstructPublicKeyReportsWhenDataTooSmall
-	$(GO) test -v ./lib/common/key_certificate -run TestConstructPublicKeyReturnsCorrectDataWithElg
-
-.PHONY: test-key-cert-all \
-        test-key-cert-signing \
-        test-key-cert-public \
-        test-key-cert-construct
--- a/doc/tests/keys_and_cert.mk
+++ b/doc/tests/keys_and_cert.mk
@@ -1,30 +0,0 @@
-test-keys-cert-all: test-keys-cert-certificate test-keys-cert-public test-keys-cert-signing test-keys-cert-creation
-
-test-keys-cert-certificate:
-	$(GO) test -v ./lib/common/keys_and_cert -run TestCertificateWithValidData
-
-test-keys-cert-public:
-	$(GO) test -v ./lib/common/keys_and_cert -run TestPublicKeyWithBadData
-	$(GO) test -v ./lib/common/keys_and_cert -run TestPublicKeyWithBadCertificate
-	$(GO) test -v ./lib/common/keys_and_cert -run TestPublicKeyWithNullCertificate
-	$(GO) test -v ./lib/common/keys_and_cert -run TestPublicKeyWithKeyCertificate
-
-test-keys-cert-signing:
-	$(GO) test -v ./lib/common/keys_and_cert -run TestSigningPublicKeyWithBadData
-	$(GO) test -v ./lib/common/keys_and_cert -run TestSigningPublicKeyWithBadCertificate
-	$(GO) test -v ./lib/common/keys_and_cert -run TestSigningPublicKeyWithNullCertificate
-	$(GO) test -v ./lib/common/keys_and_cert -run TestSigningPublicKeyWithKeyCertificate
-
-test-keys-cert-creation:
-	$(GO) test -v ./lib/common/keys_and_cert -run TestNewKeysAndCertWithMissingData
-	$(GO) test -v ./lib/common/keys_and_cert -run TestNewKeysAndCertWithMissingCertData
-	$(GO) test -v ./lib/common/keys_and_cert -run TestNewKeysAndCertWithValidDataWithCertificate
-	$(GO) test -v ./lib/common/keys_and_cert -run TestNewKeysAndCertWithValidDataWithoutCertificate
-	$(GO) test -v ./lib/common/keys_and_cert -run TestNewKeysAndCertWithValidDataWithCertificateAndRemainder
-	$(GO) test -v ./lib/common/keys_and_cert -run TestNewKeysAndCertWithValidDataWithoutCertificateAndRemainder
-
-.PHONY: test-keys-cert-all \
-        test-keys-cert-certificate \
-        test-keys-cert-public \
-        test-keys-cert-signing \
-        test-keys-cert-creation
--- a/doc/tests/lease.mk
+++ b/doc/tests/lease.mk
@@ -1,15 +0,0 @@
-test-lease-all: test-lease-tunnel-gateway test-lease-tunnel-id test-lease-date
-
-test-lease-tunnel-gateway:
-	$(GO) test -v ./lib/common/lease -run TestTunnelGateway
-
-test-lease-tunnel-id:
-	$(GO) test -v ./lib/common/lease -run TestTunnelID
-
-test-lease-date:
-	$(GO) test -v ./lib/common/lease -run TestDate
-
-.PHONY: test-lease-all \
-        test-lease-tunnel-gateway \
-        test-lease-tunnel-id \
-        test-lease-date
--- a/doc/tests/lease_set.mk
+++ b/doc/tests/lease_set.mk
@@ -1,26 +0,0 @@
-test-lease-set-all: test-lease-set-creation \
-                    test-lease-set-validation \
-                    test-lease-set-components \
-                    test-lease-set-expirations \
-                    test-lease-set-signature-verification
-test-lease-set-creation:
-	$(GO) test -v ./lib/common/lease_set -run TestLeaseSetCreation
-
-test-lease-set-validation:
-	$(GO) test -v ./lib/common/lease_set -run TestLeaseSetValidation
-
-test-lease-set-components:
-	$(GO) test -v ./lib/common/lease_set -run TestLeaseSetComponents
-
-test-lease-set-expirations:
-	$(GO) test -v ./lib/common/lease_set -run TestExpirations
-
-test-lease-set-signature-verification:
-	$(GO) test -v ./lib/common/lease_set -run TestSignatureVerification
-
-.PHONY: test-lease-set-all \
-        test-lease-set-creation \
-        test-lease-set-validation \
-        test-lease-set-components \
-        test-lease-set-expirations \
-        test-lease-set-signature-verification
--- a/doc/tests/mapping.mk
+++ b/doc/tests/mapping.mk
@@ -1,28 +0,0 @@
-test-mapping-all: test-mapping-values test-mapping-duplicates test-mapping-conversion test-mapping-utils
-
-test-mapping-values:
-	$(GO) test -v ./lib/common/data -run TestValuesExclusesPairWithBadData
-	$(GO) test -v ./lib/common/data -run TestValuesWarnsMissingData
-	$(GO) test -v ./lib/common/data -run TestValuesWarnsExtraData
-	$(GO) test -v ./lib/common/data -run TestValuesEnforcesEqualDelimitor
-	$(GO) test -v ./lib/common/data -run TestValuesEnforcedSemicolonDelimitor
-	$(GO) test -v ./lib/common/data -run TestValuesReturnsValues
-
-test-mapping-duplicates:
-	$(GO) test -v ./lib/common/data -run TestHasDuplicateKeysTrueWhenDuplicates
-	$(GO) test -v ./lib/common/data -run TestHasDuplicateKeysFalseWithoutDuplicates
-	$(GO) test -v ./lib/common/data -run TestReadMappingHasDuplicateKeys
-
-test-mapping-conversion:
-	$(GO) test -v ./lib/common/data -run TestGoMapToMappingProducesCorrectMapping
-	$(GO) test -v ./lib/common/data -run TestFullGoMapToMappingProducesCorrectMapping
-
-test-mapping-utils:
-	$(GO) test -v ./lib/common/data -run TestStopValueRead
-	$(GO) test -v ./lib/common/data -run TestBeginsWith
-
-.PHONY: test-mapping-all \
-        test-mapping-values \
-        test-mapping-duplicates \
-        test-mapping-conversion \
-        test-mapping-utils
--- a/doc/tests/mapping_values.mk
+++ b/doc/tests/mapping_values.mk
@@ -1,2 +0,0 @@
-test-mapping-values-order:
-	$(GO) test -v ./lib/common/data -run TestMappingOrderSortsValuesThenKeys
--- a/doc/tests/noise.mk
+++ b/doc/tests/noise.mk
@@ -1,19 +0,0 @@
-test-noise-transport-all: test-noise-packet-encryption test-noise-transport-connection test-noise-packet-obfuscation test-noise-packet-obfuscation-func
-
-test-noise-packet-encryption:
-	$(GO) test -v ./lib/transport/noise -run TestEncryptDecryptPacketOffline
-
-test-noise-transport-connection:
-	$(GO) test -v ./lib/transport/noise -run TestTransport
-
-test-noise-packet-obfuscation:
-	$(GO) test -v ./lib/transport/noise -run TestEncryptDecryptPacketObfsOffline
-
-test-noise-packet-obfuscation-func:
-	$(GO) test -v ./lib/transport/noise -run TestEncryptDecryptPacketObfsOfflineWithFunc
-
-.PHONY: test-noise-transport-all \
-        test-noise-packet-encryption \
-        test-noise-transport-connection \
-        test-noise-packet-obfuscation \
-        test-noise-packet-obfuscation-func
--- a/doc/tests/router_address.mk
+++ b/doc/tests/router_address.mk
@@ -1,19 +0,0 @@
-test-router-address-all: test-router-address-validation test-router-address-functionality test-router-address-fuzz
-
-test-router-address-validation:
-	$(GO) test -v ./lib/common/router_address -run TestCheckValidReportsEmptySlice
-	$(GO) test -v ./lib/common/router_address -run TestCheckRouterAddressValidReportsDataMissing
-	$(GO) test -v ./lib/common/router_address -run TestCheckRouterAddressValidNoErrWithValidData
-
-test-router-address-functionality:
-	$(GO) test -v ./lib/common/router_address -run TestRouterAddressCostReturnsFirstByte
-	$(GO) test -v ./lib/common/router_address -run TestRouterAddressExpirationReturnsCorrectData
-	$(GO) test -v ./lib/common/router_address -run TestReadRouterAddressReturnsCorrectRemainderWithoutError
-
-test-router-address-fuzz:
-	$(GO) test -v ./lib/common/router_address -run TestCorrectsFuzzCrasher1
-
-.PHONY: test-router-address-all \
-        test-router-address-validation \
-        test-router-address-functionality \
-        test-router-address-fuzz
--- a/doc/tests/router_info.mk
+++ b/doc/tests/router_info.mk
@@ -1,52 +0,0 @@
-test-router-info-all: test-router-info-creation test-router-info-published-date test-router-info-identity test-router-info-addresses test-router-info-serialization test-router-info-signature test-router-info-capabilities test-router-info-version test-router-info-good-version test-router-info-uncongested test-router-info-reachable test-router-info-10k
-
-test-router-info-creation:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoCreation
-	$(GO) test -v ./lib/common/router_info -run TestCreateRouterInfo
-
-test-router-info-published-date:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoPublishedDate
-
-test-router-info-identity:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoRouterIdentity
-
-test-router-info-addresses:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoAddresses
-
-test-router-info-serialization:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoSerialization
-
-test-router-info-signature:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoSignature
-
-test-router-info-capabilities:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoCapabilities
-
-test-router-info-version:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoVersion
-
-test-router-info-good-version:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoGoodVersion
-
-test-router-info-uncongested:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoUnCongested
-
-test-router-info-reachable:
-	$(GO) test -v ./lib/common/router_info -run TestRouterInfoReachable
-
-test-router-info-10k:
-	$(GO) test -v ./lib/common/router_info -run Test10K
-
-.PHONY: test-router-info-all \
-        test-router-info-creation \
-        test-router-info-published-date \
-        test-router-info-identity \
-        test-router-info-addresses \
-        test-router-info-serialization \
-        test-router-info-signature \
-        test-router-info-capabilities \
-        test-router-info-version \
-        test-router-info-good-version \
-        test-router-info-uncongested \
-        test-router-info-reachable \
-        test-router-info-10k
--- a/doc/tests/signatures.mk
+++ b/doc/tests/signatures.mk
@@ -1,7 +0,0 @@
-test-signatures:
-	$(GO) test -v ./lib/common/signature/ -run TestReadSignatureErrors
-	$(GO) test -v ./lib/common/signature/ -run TestReadSignature
-	$(GO) test -v ./lib/common/signature/ -run TestNewSignatureError
-	$(GO) test -v ./lib/common/signature/ -run TestNewSignature
-
-.PHONY: test-signatures
--- a/doc/tests/string.mk
+++ b/doc/tests/string.mk
@@ -1,27 +0,0 @@
-test-string-all: test-string-length test-string-data test-string-conversion test-string-read
-
-test-string-length:
-	$(GO) test -v ./lib/common/data -run TestStringReportsCorrectLength
-	$(GO) test -v ./lib/common/data -run TestI2PStringReportsLengthZeroError
-	$(GO) test -v ./lib/common/data -run TestI2PStringReportsExtraDataError
-	$(GO) test -v ./lib/common/data -run TestI2PStringDataReportsLengthZeroError
-
-test-string-data:
-	$(GO) test -v ./lib/common/data -run TestI2PStringDataReportsExtraDataError
-	$(GO) test -v ./lib/common/data -run TestI2PStringDataEmptyWhenZeroLength
-	$(GO) test -v ./lib/common/data -run TestI2PStringDataErrorWhenNonZeroLengthOnly
-
-test-string-conversion:
-	$(GO) test -v ./lib/common/data -run TestToI2PI2PStringFormatsCorrectly
-	$(GO) test -v ./lib/common/data -run TestToI2PStringReportsOverflows
-
-test-string-read:
-	$(GO) test -v ./lib/common/data -run TestReadStringReadsLength
-	$(GO) test -v ./lib/common/data -run TestReadI2PStringErrWhenEmptySlice
-	$(GO) test -v ./lib/common/data -run TestReadI2PStringErrWhenDataTooShort
-
-.PHONY: test-string-all \
-        test-string-length \
-        test-string-data \
-        test-string-conversion \
-        test-string-read
--- a/doc/tests/su3.mk
+++ b/doc/tests/su3.mk
@@ -1,11 +0,0 @@
-test-su3-all: test-su3-read test-su3-signature
-
-test-su3-read:
-	$(GO) test -v ./lib/su3 -run TestRead
-
-test-su3-signature:
-	$(GO) test -v ./lib/su3 -run TestReadSignatureFirst
-
-.PHONY: test-su3-all \
-        test-su3-read \
-        test-su3-signature
--- a/doc/tests/tunnel.mk
+++ b/doc/tests/tunnel.mk
@@ -1,22 +0,0 @@
-test-tunnel-all: test-tunnel-delivery-instructions test-tunnel-message
-
-# Tests from delivery_test.go
-test-tunnel-delivery-instructions:
-	$(GO) test -v ./lib/tunnel -run TestReadDeliveryInstructions
-
-# Tests from message_test.go
-test-tunnel-message: test-tunnel-message-padding test-tunnel-message-fragments
-
-test-tunnel-message-padding:
-	$(GO) test -v ./lib/tunnel -run TestDeliveryInstructionDataWithNoPadding
-	$(GO) test -v ./lib/tunnel -run TestDeliveryInstructionDataWithSomePadding
-	$(GO) test -v ./lib/tunnel -run TestDeliveryInstructionDataWithOnlyPadding
-
-test-tunnel-message-fragments:
-	$(GO) test -v ./lib/tunnel -run TestDeliveryInstructionsWithFragments
-
-.PHONY: test-tunnel-all \
-        test-tunnel-delivery-instructions \
-        test-tunnel-message \
-        test-tunnel-message-padding \
-        test-tunnel-message-fragments
--- a/go.mod
+++ b/go.mod
@@ -1,50 +1,9 @@
 module github.com/go-i2p/go-i2p

-go 1.24.2
+go 1.16

 require (
-	github.com/beevik/ntp v1.4.3
-	github.com/emirpasic/gods v1.18.1
-	github.com/eyedeekay/go-unzip v0.0.0-20240201194209-560d8225b50e
-	github.com/flynn/noise v1.1.0
-	github.com/go-i2p/common v0.0.0-20250715213359-dfa5527ece83
-	github.com/go-i2p/crypto v0.0.0-20250715205812-c9e7853bc978
-	github.com/go-i2p/logger v0.0.0-20241123010126-3050657e5d0c
-	github.com/samber/oops v1.19.0
-	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.9.1
-	github.com/spf13/viper v1.19.0
-	github.com/stretchr/testify v1.10.0
-	golang.org/x/crypto v0.39.0
-	gopkg.in/yaml.v3 v3.0.1
-)
-
-require (
-	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/magiconair/properties v1.8.9 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/oklog/ulid/v2 v2.1.1 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/sagikazarmark/locafero v0.7.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/samber/lo v1.51.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.12.0 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
-	github.com/spf13/pflag v1.0.6 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
-	go.opentelemetry.io/otel v1.36.0 // indirect
-	go.opentelemetry.io/otel/trace v1.36.0 // indirect
-	go.step.sm/crypto v0.67.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
-	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
+	github.com/sirupsen/logrus v1.8.1
+	github.com/stretchr/testify v1.7.0
+	golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc
 )
--- a/go.sum
+++ b/go.sum
@@ -1,116 +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/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
-github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-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/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/go-i2p/common v0.0.0-20250709015428-90b991723618 h1:ZOvrfUmG/SIzOVsICzrqpgoLRZb/gv2i0TgURvqMgeo=
-github.com/go-i2p/common v0.0.0-20250709015428-90b991723618/go.mod h1:Hq9v0qoOgIWVs/cYszDqw5rhk6DjnHLHm6+75/+Y6m0=
-github.com/go-i2p/common v0.0.0-20250715213359-dfa5527ece83 h1:F6xM06QyqR+qMYA4SzWzUzfVmkSE1P41tHK32TmGxP8=
-github.com/go-i2p/common v0.0.0-20250715213359-dfa5527ece83/go.mod h1:e6X6esQk0zaevdZPZecKY7n8+wOfOLukQfWw558DYfk=
-github.com/go-i2p/crypto v0.0.0-20250715205812-c9e7853bc978 h1:YnaXZy814nG+kSpZs6z53Z4TMt1NnMIJNbBHlE4KBc0=
-github.com/go-i2p/crypto v0.0.0-20250715205812-c9e7853bc978/go.mod h1:1Y3NCpVg6OgE3c2VPRQ3QDmWPtDpJYLIyRBA1iJCd3E=
-github.com/go-i2p/logger v0.0.0-20241123010126-3050657e5d0c h1:VTiECn3dFEmUlZjto+wOwJ7SSJTHPLyNprQMR5HzIMI=
-github.com/go-i2p/logger v0.0.0-20241123010126-3050657e5d0c/go.mod h1:te7Zj3g3oMeIl8uBXAgO62UKmZ6m6kHRNg1Mm+X8Hzk=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
-github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s=
-github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
-github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
-github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
-github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
+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/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo=
-github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
-github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
-github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
-github.com/samber/lo v1.51.0 h1:kysRYLbHy/MB7kQZf5DSN50JHmMsNEdeY24VzJFu7wI=
-github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
-github.com/samber/oops v1.19.0 h1:sfZAwC8MmTXBRRyNc4Z1utuTPBx+hFKF5fJ9DEQRZfw=
-github.com/samber/oops v1.19.0/go.mod h1:+f+61dbiMxEMQ8gw/zTxW2pk+YGobaDM4glEHQtPOww=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
-github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
-github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
-github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
-github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
-github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
-github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
+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.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
-github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
-go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
-go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
-go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
-go.step.sm/crypto v0.67.0 h1:1km9LmxMKG/p+mKa1R4luPN04vlJYnRLlLQrWv7egGU=
-go.step.sm/crypto v0.67.0/go.mod h1:+AoDpB0mZxbW/PmOXuwkPSpXRgaUaoIK+/Wx/HGgtAU=
-go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
-go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
-golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
+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.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+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.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 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/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
 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/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+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=
--- a/lib/bootstrap/README.md
+++ b/lib/bootstrap/README.md
@@ -1,57 +0,0 @@
-# bootstrap
--
-    import "github.com/go-i2p/go-i2p/lib/bootstrap"
-
-![bootstrap.svg](bootstrap.svg)
-
-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(ctx context.Context, n int) ([]router_info.RouterInfo, error)
-}
-```
-
-interface defining a way to bootstrap into the i2p network
-
-#### type ReseedBootstrap
-
-```go
-type ReseedBootstrap struct {
-}
-```
-
-ReseedBootstrap implements the Bootstrap interface using HTTP reseeding
-
-#### func  NewReseedBootstrap
-
-```go
-func NewReseedBootstrap(config *config.BootstrapConfig) *ReseedBootstrap
-```
-NewReseedBootstrap creates a new reseeder with the provided configuration
-
-#### func (*ReseedBootstrap) GetPeers
-
-```go
-func (rb *ReseedBootstrap) GetPeers(ctx context.Context, n int) ([]router_info.RouterInfo, error)
-```
-GetPeers implements the Bootstrap interface by obtaining RouterInfos from
-configured reseed servers
-
-
-
-bootstrap 
-
-github.com/go-i2p/go-i2p/lib/bootstrap
-
-[go-i2p template file](/template.md)
--- a/lib/bootstrap/bootstrap.go
+++ b/lib/bootstrap/bootstrap.go
@@ -1,10 +1,6 @@
 package bootstrap

-import (
-	"context"
-
-	"github.com/go-i2p/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 {
@@ -13,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(ctx context.Context, n int) ([]router_info.RouterInfo, error)
+	GetPeers(n int) (chan []common.RouterInfo, error)
 }
--- a/lib/bootstrap/bootstrap.svg
+++ b/lib/bootstrap/bootstrap.svg
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: gocallvis Pages: 1 -->
-<svg width="365pt" height="722pt"
- viewBox="0.00 0.00 364.72 722.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 722)">
-<title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-722 364.7182,-722 364.7182,0 0,0"/>
-<g id="clust1" class="cluster">
-<title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="0,-8 0,-714 356.7182,-714 356.7182,-8 0,-8"/>
-<text text-anchor="middle" x="178.3591" y="-693.8" font-family="Arial" font-size="18.00" fill="#000000">bootstrap</text>
-</g>
-<g id="clust5" class="cluster">
-<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed</title>
-<g id="a_clust5"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M242.0218,-598C242.0218,-598 334.2252,-598 334.2252,-598 340.2252,-598 346.2252,-604 346.2252,-610 346.2252,-610 346.2252,-664 346.2252,-664 346.2252,-670 340.2252,-676 334.2252,-676 334.2252,-676 242.0218,-676 242.0218,-676 236.0218,-676 230.0218,-670 230.0218,-664 230.0218,-664 230.0218,-610 230.0218,-610 230.0218,-604 236.0218,-598 242.0218,-598"/>
-<text text-anchor="middle" x="288.1235" y="-606.5" font-family="Arial" font-size="15.00" fill="#222222">(Reseed)</text>
-</a>
-</g>
-</g>
-<g id="clust4" class="cluster">
-<title>cluster_*github.com/sirupsen/logrus.Logger</title>
-<g id="a_clust4"><a xlink:title="type: *github.com/sirupsen/logrus.Logger">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M261.4629,-451C261.4629,-451 315.7841,-451 315.7841,-451 321.7841,-451 327.7841,-457 327.7841,-463 327.7841,-463 327.7841,-578 327.7841,-578 327.7841,-584 321.7841,-590 315.7841,-590 315.7841,-590 261.4629,-590 261.4629,-590 255.4629,-590 249.4629,-584 249.4629,-578 249.4629,-578 249.4629,-463 249.4629,-463 249.4629,-457 255.4629,-451 261.4629,-451"/>
-<text text-anchor="middle" x="288.6235" y="-459.5" font-family="Arial" font-size="15.00" fill="#222222">(*Logger)</text>
-</a>
-</g>
-</g>
-<g id="clust3" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/logger.Logger</title>
-<g id="a_clust3"><a xlink:title="type: *github.com/go&#45;i2p/logger.Logger">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M249.0141,-182C249.0141,-182 327.2329,-182 327.2329,-182 333.2329,-182 339.2329,-188 339.2329,-194 339.2329,-194 339.2329,-431 339.2329,-431 339.2329,-437 333.2329,-443 327.2329,-443 327.2329,-443 249.0141,-443 249.0141,-443 243.0141,-443 237.0141,-437 237.0141,-431 237.0141,-431 237.0141,-194 237.0141,-194 237.0141,-188 243.0141,-182 249.0141,-182"/>
-<text text-anchor="middle" x="288.1235" y="-190.5" font-family="Arial" font-size="15.00" fill="#222222">(*Logger)</text>
-</a>
-</g>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap</title>
-<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M20,-304C20,-304 143.5288,-304 143.5288,-304 149.5288,-304 155.5288,-310 155.5288,-316 155.5288,-316 155.5288,-370 155.5288,-370 155.5288,-376 149.5288,-382 143.5288,-382 143.5288,-382 20,-382 20,-382 14,-382 8,-376 8,-370 8,-370 8,-316 8,-316 8,-310 14,-304 20,-304"/>
-<text text-anchor="middle" x="81.7644" y="-312.5" font-family="Arial" font-size="15.00" fill="#222222">(*ReseedBootstrap)</text>
-</a>
-</g>
-</g>
-<!-- github.com/samber/oops.Errorf -->
-<g id="node1" class="node">
-<title>github.com/samber/oops.Errorf</title>
-<g id="a_node1"><a xlink:title="github.com/samber/oops.Errorf | defined in oops.go:34">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M305.3188,-113C305.3188,-113 270.9282,-113 270.9282,-113 264.9282,-113 258.9282,-107 258.9282,-101 258.9282,-101 258.9282,-89 258.9282,-89 258.9282,-83 264.9282,-77 270.9282,-77 270.9282,-77 305.3188,-77 305.3188,-77 311.3188,-77 317.3188,-83 317.3188,-89 317.3188,-89 317.3188,-101 317.3188,-101 317.3188,-107 311.3188,-113 305.3188,-113"/>
-<text text-anchor="middle" x="288.1235" y="-99.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
-<text text-anchor="middle" x="288.1235" y="-82.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.NewReseed -->
-<g id="node2" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.NewReseed</title>
-<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.NewReseed | defined in new.go:10">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M321.4764,-174C321.4764,-174 254.7706,-174 254.7706,-174 248.7706,-174 242.7706,-168 242.7706,-162 242.7706,-162 242.7706,-150 242.7706,-150 242.7706,-144 248.7706,-138 254.7706,-138 254.7706,-138 321.4764,-138 321.4764,-138 327.4764,-138 333.4764,-144 333.4764,-150 333.4764,-150 333.4764,-162 333.4764,-162 333.4764,-168 327.4764,-174 321.4764,-174"/>
-<text text-anchor="middle" x="288.1235" y="-160.2" font-family="Verdana" font-size="14.00" fill="#000000">reseed</text>
-<text text-anchor="middle" x="288.1235" y="-143.4" font-family="Verdana" font-size="14.00" fill="#000000">NewReseed</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.init -->
-<g id="node3" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.init</title>
-<g id="a_node3"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.init | defined in .:0&#10;at reseed_bootstrap.go:15: calling [github.com/go&#45;i2p/logger.GetGoI2PLogger]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M96.2644,-52C96.2644,-52 66.2644,-52 66.2644,-52 60.2644,-52 54.2644,-46 54.2644,-40 54.2644,-40 54.2644,-28 54.2644,-28 54.2644,-22 60.2644,-16 66.2644,-16 66.2644,-16 96.2644,-16 96.2644,-16 102.2644,-16 108.2644,-22 108.2644,-28 108.2644,-28 108.2644,-40 108.2644,-40 108.2644,-46 102.2644,-52 96.2644,-52"/>
-<text text-anchor="middle" x="81.2644" y="-29.8" font-family="Verdana" font-size="14.00" fill="#000000">init</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/logger.GetGoI2PLogger -->
-<g id="node4" class="node">
-<title>github.com/go&#45;i2p/logger.GetGoI2PLogger</title>
-<g id="a_node4"><a xlink:title="github.com/go&#45;i2p/logger.GetGoI2PLogger | defined in log.go:120">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M336.813,-52C336.813,-52 239.434,-52 239.434,-52 233.434,-52 227.434,-46 227.434,-40 227.434,-40 227.434,-28 227.434,-28 227.434,-22 233.434,-16 239.434,-16 239.434,-16 336.813,-16 336.813,-16 342.813,-16 348.813,-22 348.813,-28 348.813,-28 348.813,-40 348.813,-40 348.813,-46 342.813,-52 336.813,-52"/>
-<text text-anchor="middle" x="288.1235" y="-38.2" font-family="Verdana" font-size="14.00" fill="#000000">logger</text>
-<text text-anchor="middle" x="288.1235" y="-21.4" font-family="Verdana" font-size="14.00" fill="#000000">GetGoI2PLogger</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.init&#45;&gt;github.com/go&#45;i2p/logger.GetGoI2PLogger -->
-<g id="edge10" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.init&#45;&gt;github.com/go&#45;i2p/logger.GetGoI2PLogger</title>
-<g id="a_edge10"><a xlink:title="at reseed_bootstrap.go:15: calling [github.com/go&#45;i2p/logger.GetGoI2PLogger]">
-<path fill="none" stroke="#8b4513" d="M108.3076,-34C135.736,-34 179.3573,-34 216.7663,-34"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="217.1342,-37.5001 227.1342,-34 217.1341,-30.5001 217.1342,-37.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers -->
-<g id="node5" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers</title>
-<g id="a_node5"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers | defined in reseed_bootstrap.go:32&#10;at reseed_bootstrap.go:40: calling [github.com/samber/oops.Errorf]&#10;at reseed_bootstrap.go:53: calling [github.com/samber/oops.Errorf]&#10;at reseed_bootstrap.go:73: calling [github.com/samber/oops.Errorf]&#10;at reseed_bootstrap.go:43: calling [(*github.com/go&#45;i2p/logger.Logger).WithField]&#10;at reseed_bootstrap.go:52: calling [(*github.com/go&#45;i2p/logger.Logger).WithField]&#10;at reseed_bootstrap.go:43: calling [(*github.com/sirupsen/logrus.Logger).Debug]&#10;at reseed_bootstrap.go:52: calling [(*github.com/go&#45;i2p/logger.Logger).WithError]&#10;at reseed_bootstrap.go:52: calling [(*github.com/go&#45;i2p/logger.Logger).Warn]&#10;at reseed_bootstrap.go:63: calling [(*github.com/sirupsen/logrus.Logger).Info]&#10;at reseed_bootstrap.go:46: calling [github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.NewReseed]&#10;at reseed_bootstrap.go:49: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed).SingleReseed]&#10;at reseed_bootstrap.go:59: calling [(*github.com/go&#45;i2p/logger.Logger).WithFields]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M106.2947,-374C106.2947,-374 56.2341,-374 56.2341,-374 50.2341,-374 44.2341,-368 44.2341,-362 44.2341,-362 44.2341,-350 44.2341,-350 44.2341,-344 50.2341,-338 56.2341,-338 56.2341,-338 106.2947,-338 106.2947,-338 112.2947,-338 118.2947,-344 118.2947,-350 118.2947,-350 118.2947,-362 118.2947,-362 118.2947,-368 112.2947,-374 106.2947,-374"/>
-<text text-anchor="middle" x="81.2644" y="-351.8" font-family="Verdana" font-size="14.00" fill="#000000">GetPeers</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge1" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge1"><a xlink:title="at reseed_bootstrap.go:40: calling [github.com/samber/oops.Errorf]&#10;at reseed_bootstrap.go:53: calling [github.com/samber/oops.Errorf]&#10;at reseed_bootstrap.go:73: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M118.4074,-352.073C131.5385,-349.0001 145.5161,-343.5697 155.5288,-334 190.8891,-300.2044 195.4391,-162.9154 227.5288,-126 233.5557,-119.0668 241.5102,-113.4857 249.6658,-109.0748"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="251.4166,-112.115 258.8672,-104.5824 248.3454,-105.8247 251.4166,-112.115"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.NewReseed -->
-<g id="edge7" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.NewReseed</title>
-<g id="a_edge7"><a xlink:title="at reseed_bootstrap.go:46: calling [github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.NewReseed]">
-<path fill="none" stroke="#8b4513" d="M118.6751,-351.3434C131.5313,-348.1844 145.2575,-342.8857 155.5288,-334 213.2793,-284.0401 171.3098,-229.6772 227.5288,-178 229.4394,-176.2438 231.5009,-174.6252 233.6705,-173.1338"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="235.6115,-176.0535 242.4829,-167.9892 232.0823,-170.0083 235.6115,-176.0535"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/logger.Logger).WithField -->
-<g id="node6" class="node">
-<title>(*github.com/go&#45;i2p/logger.Logger).WithField</title>
-<g id="a_node6"><a xlink:title="(*github.com/go&#45;i2p/logger.Logger).WithField | defined in log.go:54">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M316.398,-252C316.398,-252 259.849,-252 259.849,-252 253.849,-252 247.849,-246 247.849,-240 247.849,-240 247.849,-228 247.849,-228 247.849,-222 253.849,-216 259.849,-216 259.849,-216 316.398,-216 316.398,-216 322.398,-216 328.398,-222 328.398,-228 328.398,-228 328.398,-240 328.398,-240 328.398,-246 322.398,-252 316.398,-252"/>
-<text text-anchor="middle" x="288.1235" y="-238.2" font-family="Verdana" font-size="14.00" fill="#000000">logger</text>
-<text text-anchor="middle" x="288.1235" y="-221.4" font-family="Verdana" font-size="14.00" fill="#000000">WithField</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).WithField -->
-<g id="edge2" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).WithField</title>
-<g id="a_edge2"><a xlink:title="at reseed_bootstrap.go:43: calling [(*github.com/go&#45;i2p/logger.Logger).WithField]&#10;at reseed_bootstrap.go:52: calling [(*github.com/go&#45;i2p/logger.Logger).WithField]">
-<path fill="none" stroke="#8b4513" d="M118.5683,-348.6617C130.8549,-345.2944 144.2489,-340.5496 155.5288,-334 193.8581,-311.7444 191.4175,-290.6986 227.5288,-265 231.4159,-262.2337 235.5842,-259.5689 239.8482,-257.0424"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="241.6859,-260.0242 248.6757,-252.0623 238.2464,-253.9275 241.6859,-260.0242"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/logger.Logger).WithError -->
-<g id="node7" class="node">
-<title>(*github.com/go&#45;i2p/logger.Logger).WithError</title>
-<g id="a_node7"><a xlink:title="(*github.com/go&#45;i2p/logger.Logger).WithError | defined in log.go:66">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M316.655,-313C316.655,-313 259.592,-313 259.592,-313 253.592,-313 247.592,-307 247.592,-301 247.592,-301 247.592,-289 247.592,-289 247.592,-283 253.592,-277 259.592,-277 259.592,-277 316.655,-277 316.655,-277 322.655,-277 328.655,-283 328.655,-289 328.655,-289 328.655,-301 328.655,-301 328.655,-307 322.655,-313 316.655,-313"/>
-<text text-anchor="middle" x="288.1235" y="-299.2" font-family="Verdana" font-size="14.00" fill="#000000">logger</text>
-<text text-anchor="middle" x="288.1235" y="-282.4" font-family="Verdana" font-size="14.00" fill="#000000">WithError</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).WithError -->
-<g id="edge4" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).WithError</title>
-<g id="a_edge4"><a xlink:title="at reseed_bootstrap.go:52: calling [(*github.com/go&#45;i2p/logger.Logger).WithError]">
-<path fill="none" stroke="#8b4513" d="M118.725,-344.9534C151.9288,-335.162 200.7001,-320.78 237.3948,-309.9592"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="238.7997,-313.194 247.4014,-307.0084 236.8198,-306.4798 238.7997,-313.194"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/logger.Logger).Warn -->
-<g id="node8" class="node">
-<title>(*github.com/go&#45;i2p/logger.Logger).Warn</title>
-<g id="a_node8"><a xlink:title="(*github.com/go&#45;i2p/logger.Logger).Warn | defined in log.go:30">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M305.8898,-374C305.8898,-374 270.3572,-374 270.3572,-374 264.3572,-374 258.3572,-368 258.3572,-362 258.3572,-362 258.3572,-350 258.3572,-350 258.3572,-344 264.3572,-338 270.3572,-338 270.3572,-338 305.8898,-338 305.8898,-338 311.8898,-338 317.8898,-344 317.8898,-350 317.8898,-350 317.8898,-362 317.8898,-362 317.8898,-368 311.8898,-374 305.8898,-374"/>
-<text text-anchor="middle" x="288.1235" y="-360.2" font-family="Verdana" font-size="14.00" fill="#000000">logger</text>
-<text text-anchor="middle" x="288.1235" y="-343.4" font-family="Verdana" font-size="14.00" fill="#000000">Warn</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).Warn -->
-<g id="edge5" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).Warn</title>
-<g id="a_edge5"><a xlink:title="at reseed_bootstrap.go:52: calling [(*github.com/go&#45;i2p/logger.Logger).Warn]">
-<path fill="none" stroke="#8b4513" d="M118.725,-356C155.3343,-356 210.8683,-356 248.2746,-356"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="248.3136,-359.5001 258.3136,-356 248.3135,-352.5001 248.3136,-359.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/logger.Logger).WithFields -->
-<g id="node9" class="node">
-<title>(*github.com/go&#45;i2p/logger.Logger).WithFields</title>
-<g id="a_node9"><a xlink:title="(*github.com/go&#45;i2p/logger.Logger).WithFields | defined in log.go:60">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M319.3426,-435C319.3426,-435 256.9044,-435 256.9044,-435 250.9044,-435 244.9044,-429 244.9044,-423 244.9044,-423 244.9044,-411 244.9044,-411 244.9044,-405 250.9044,-399 256.9044,-399 256.9044,-399 319.3426,-399 319.3426,-399 325.3426,-399 331.3426,-405 331.3426,-411 331.3426,-411 331.3426,-423 331.3426,-423 331.3426,-429 325.3426,-435 319.3426,-435"/>
-<text text-anchor="middle" x="288.1235" y="-421.2" font-family="Verdana" font-size="14.00" fill="#000000">logger</text>
-<text text-anchor="middle" x="288.1235" y="-404.4" font-family="Verdana" font-size="14.00" fill="#000000">WithFields</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).WithFields -->
-<g id="edge9" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).WithFields</title>
-<g id="a_edge9"><a xlink:title="at reseed_bootstrap.go:59: calling [(*github.com/go&#45;i2p/logger.Logger).WithFields]">
-<path fill="none" stroke="#8b4513" d="M118.725,-367.0466C151.1839,-376.6183 198.5195,-390.577 234.9071,-401.3072"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="234.2768,-404.7703 244.8585,-404.2417 236.2568,-398.0561 234.2768,-404.7703"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/sirupsen/logrus.Logger).Debug -->
-<g id="node10" class="node">
-<title>(*github.com/sirupsen/logrus.Logger).Debug</title>
-<g id="a_node10"><a xlink:title="(*github.com/sirupsen/logrus.Logger).Debug | defined in logger.go:221">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M306.9455,-521C306.9455,-521 269.3015,-521 269.3015,-521 263.3015,-521 257.3015,-515 257.3015,-509 257.3015,-509 257.3015,-497 257.3015,-497 257.3015,-491 263.3015,-485 269.3015,-485 269.3015,-485 306.9455,-485 306.9455,-485 312.9455,-485 318.9455,-491 318.9455,-497 318.9455,-497 318.9455,-509 318.9455,-509 318.9455,-515 312.9455,-521 306.9455,-521"/>
-<text text-anchor="middle" x="288.1235" y="-507.2" font-family="Verdana" font-size="14.00" fill="#000000">logrus</text>
-<text text-anchor="middle" x="288.1235" y="-490.4" font-family="Verdana" font-size="14.00" fill="#000000">Debug</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/sirupsen/logrus.Logger).Debug -->
-<g id="edge3" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/sirupsen/logrus.Logger).Debug</title>
-<g id="a_edge3"><a xlink:title="at reseed_bootstrap.go:43: calling [(*github.com/sirupsen/logrus.Logger).Debug]">
-<path fill="none" stroke="#8b4513" d="M106.6294,-374.0251C143.6948,-400.3648 212.738,-449.4289 254.1541,-478.8604"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="252.3722,-481.8878 262.551,-484.8275 256.427,-476.1818 252.3722,-481.8878"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/sirupsen/logrus.Logger).Info -->
-<g id="node11" class="node">
-<title>(*github.com/sirupsen/logrus.Logger).Info</title>
-<g id="a_node11"><a xlink:title="(*github.com/sirupsen/logrus.Logger).Info | defined in logger.go:225">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M305.6193,-582C305.6193,-582 270.6277,-582 270.6277,-582 264.6277,-582 258.6277,-576 258.6277,-570 258.6277,-570 258.6277,-558 258.6277,-558 258.6277,-552 264.6277,-546 270.6277,-546 270.6277,-546 305.6193,-546 305.6193,-546 311.6193,-546 317.6193,-552 317.6193,-558 317.6193,-558 317.6193,-570 317.6193,-570 317.6193,-576 311.6193,-582 305.6193,-582"/>
-<text text-anchor="middle" x="288.1235" y="-568.2" font-family="Verdana" font-size="14.00" fill="#000000">logrus</text>
-<text text-anchor="middle" x="288.1235" y="-551.4" font-family="Verdana" font-size="14.00" fill="#000000">Info</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/sirupsen/logrus.Logger).Info -->
-<g id="edge6" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(*github.com/sirupsen/logrus.Logger).Info</title>
-<g id="a_edge6"><a xlink:title="at reseed_bootstrap.go:63: calling [(*github.com/sirupsen/logrus.Logger).Info]">
-<path fill="none" stroke="#8b4513" d="M92.3256,-374.0399C114.3749,-408.7975 166.9292,-485.8578 227.5288,-534 234.1285,-539.243 241.7932,-543.9051 249.4061,-547.8995"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="248.0753,-551.1458 258.5915,-552.435 251.1745,-544.8692 248.0753,-551.1458"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed).SingleReseed -->
-<g id="node12" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed).SingleReseed</title>
-<g id="a_node12"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed).SingleReseed | defined in reseed.go:31">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M326.3271,-668C326.3271,-668 249.9199,-668 249.9199,-668 243.9199,-668 237.9199,-662 237.9199,-656 237.9199,-656 237.9199,-644 237.9199,-644 237.9199,-638 243.9199,-632 249.9199,-632 249.9199,-632 326.3271,-632 326.3271,-632 332.3271,-632 338.3271,-638 338.3271,-644 338.3271,-644 338.3271,-656 338.3271,-656 338.3271,-662 332.3271,-668 326.3271,-668"/>
-<text text-anchor="middle" x="288.1235" y="-654.2" font-family="Verdana" font-size="14.00" fill="#000000">reseed</text>
-<text text-anchor="middle" x="288.1235" y="-637.4" font-family="Verdana" font-size="14.00" fill="#000000">SingleReseed</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed).SingleReseed -->
-<g id="edge8" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/bootstrap.ReseedBootstrap).GetPeers&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed).SingleReseed</title>
-<g id="a_edge8"><a xlink:title="at reseed_bootstrap.go:49: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/netdb/reseed.Reseed).SingleReseed]">
-<path fill="none" stroke="#8b4513" d="M89.919,-374.0435C110.3702,-415.6822 164.7136,-520.678 227.5288,-596 236.2167,-606.4176 246.9389,-616.6363 256.9371,-625.3325"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="254.8567,-628.1572 264.7475,-631.9549 259.3837,-622.8181 254.8567,-628.1572"/>
-</a>
-</g>
-</g>
-</g>
-</svg>
--- a/lib/bootstrap/doc.go
+++ b/lib/bootstrap/doc.go
@@ -1,2 +1,4 @@
+//
 // provides generic interfaces for initial bootstrap into network and network reseeding
+//
 package bootstrap
--- a/lib/bootstrap/reseed_bootstrap.go
+++ b/lib/bootstrap/reseed_bootstrap.go
@@ -1,77 +0,0 @@
-package bootstrap
-
-import (
-	"context"
-
-	"github.com/go-i2p/common/router_info"
-	"github.com/go-i2p/go-i2p/lib/config"
-	"github.com/go-i2p/go-i2p/lib/netdb/reseed"
-	"github.com/go-i2p/logger"
-	"github.com/sirupsen/logrus"
-
-	"github.com/samber/oops"
-)
-
-var log = logger.GetGoI2PLogger()
-
-// ReseedBootstrap implements the Bootstrap interface using HTTP reseeding
-type ReseedBootstrap struct {
-	// Configuration containing reseed servers
-	config *config.BootstrapConfig
-}
-
-// NewReseedBootstrap creates a new reseeder with the provided configuration
-func NewReseedBootstrap(config *config.BootstrapConfig) *ReseedBootstrap {
-	return &ReseedBootstrap{
-		config: config,
-	}
-}
-
-// GetPeers implements the Bootstrap interface by obtaining RouterInfos
-// from configured reseed servers
-func (rb *ReseedBootstrap) GetPeers(ctx context.Context, n int) ([]router_info.RouterInfo, error) {
-	var allRouterInfos []router_info.RouterInfo
-	var lastErr error
-
-	// Try each reseed server until we get enough routerInfos or exhaust all servers
-	for _, server := range rb.config.ReseedServers {
-		// Check if context is canceled before making request
-		if ctx.Err() != nil {
-			return nil, oops.Errorf("reseed canceled: %v", ctx.Err())
-		}
-
-		log.WithField("server", server.Url).Debug("Attempting to reseed from server")
-
-		// Use the existing Reseed implementation with a timeout context
-		reseeder := reseed.NewReseed()
-
-		// Perform the actual reseeding operation synchronously
-		serverRIs, err := reseeder.SingleReseed(server.Url)
-
-		if err != nil {
-			log.WithError(err).WithField("server", server.Url).Warn("Reseed attempt failed")
-			lastErr = oops.Errorf("reseed from %s failed: %v", server.Url, err)
-			continue
-		}
-
-		// Add the retrieved RouterInfos to our collection
-		allRouterInfos = append(allRouterInfos, serverRIs...)
-		log.WithFields(logrus.Fields{
-			"server": server.Url,
-			"count":  len(serverRIs),
-			"total":  len(allRouterInfos),
-		}).Info("Successfully obtained router infos from reseed server")
-
-		// Check if we have enough RouterInfos
-		if n > 0 && len(allRouterInfos) >= n {
-			break
-		}
-	}
-
-	// If we couldn't get any RouterInfos from any server, return the last error
-	if len(allRouterInfos) == 0 && lastErr != nil {
-		return nil, oops.Errorf("all reseed attempts failed: %w", lastErr)
-	}
-
-	return allRouterInfos, nil
-}
--- a/lib/common/base32/base32.go
+++ b/lib/common/base32/base32.go
@@ -0,0 +1,18 @@
+//
+// base32 encoding using I2P's alphabet
+//
+package base32
+
+import (
+	b32 "encoding/base32"
+)
+
+var I2PEncoding *b32.Encoding = b32.NewEncoding("abcdefghijklmnopqrstuvwxyz234567")
+
+//
+// Return a go string of the I2P base32
+// encoding of the provided byte slice
+//
+func EncodeToString(data []byte) string {
+	return I2PEncoding.EncodeToString(data)
+}
--- a/lib/common/base64/base64.go
+++ b/lib/common/base64/base64.go
@@ -0,0 +1,30 @@
+//
+// base64 encoding using I2P's alphabet
+//
+package base64
+
+import (
+	b64 "encoding/base64"
+)
+
+// i2p base64 alphabet
+const Alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-~"
+
+// i2p base64 encoding
+var I2PEncoding *b64.Encoding = b64.NewEncoding(Alphabet)
+
+//
+// Return a go string of the I2P base64
+// encoding of the provided byte slice
+//
+func EncodeToString(data []byte) string {
+	return I2PEncoding.EncodeToString(data)
+}
+
+//
+// decode string using i2p base64 encoding
+// returns error if data is malfromed
+//
+func DecodeFromString(str string) (d []byte, err error) {
+	return I2PEncoding.DecodeString(str)
+}
--- a/lib/common/certificate.go
+++ b/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
+}
--- a/lib/common/certificate_test.go
+++ b/lib/common/certificate_test.go
@@ -0,0 +1,175 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCertificateTypeIsFirstByte(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x03, 0x00, 0x00}
+	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)
+}
+
+func TestCertificateLengthCorrect(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x03, 0x00, 0x02, 0xff, 0xff}
+	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, "ReadCertificate() should not return an error with valid data")
+}
+
+func TestCertificateLengthErrWhenTooShort(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x03, 0x01}
+	certificate, _, err := ReadCertificate(bytes)
+	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 length: certificate is too short", err.Error(), "correct error message should be returned")
+	}
+}
+
+func TestCertificateLengthErrWhenDataTooShort(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x03, 0x00, 0x02, 0xff}
+	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) {
+		assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error(), "correct error message should be returned")
+	}
+}
+
+func TestCertificateDataWhenCorrectSize(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x03, 0x00, 0x01, 0xaa}
+	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")
+
+	assert.Equal(cert_len, 1, "certificate.Length() did not return indicated length when data was valid")
+	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, _, 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")
+	}
+
+	assert.Equal(cert_len, 2, "certificate.Length() did not return indicated length when data was too long")
+	if certificate.CertBytes[0] != 0xff || certificate.CertBytes[1] != 0xff {
+		t.Fatal("certificate.Data() returned incorrect data when data was too long")
+	}
+}
+
+func TestCertificateDataWhenTooShort(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x03, 0x00, 0x02, 0xff}
+	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")
+	}
+	cert_len := len(cert_data)
+	assert.Equal(cert_len, 1, "certificate.Data() did not return correct amount of data when data too short")
+	assert.Equal(255, int(cert_data[0]), "certificate.Data() did not return correct data values when data was too short")
+}
+
+func TestReadCertificateWithCorrectData(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x00, 0x00, 0x02, 0xff, 0xff}
+	cert, remainder, err := ReadCertificate(bytes)
+
+	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")
+}
+
+func TestReadCertificateWithDataTooShort(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x00, 0x00, 0x02, 0xff}
+	cert, remainder, err := ReadCertificate(bytes)
+
+	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")
+	}
+}
+
+func TestReadCertificateWithRemainder(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x00, 0x00, 0x02, 0xff, 0xff, 0x01}
+	cert, remainder, err := ReadCertificate(bytes)
+
+	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.NotNil(err)
+}
+
+func TestReadCertificateWithInvalidLength(t *testing.T) {
+	assert := assert.New(t)
+
+	bytes := []byte{0x00, 0x00}
+	cert, remainder, err := ReadCertificate(bytes)
+
+	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 length: certificate is too short", err.Error(), "correct error message should be returned")
+	}
+}
--- a/lib/common/date.go
+++ b/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
+}
--- a/lib/common/date_test.go
+++ b/lib/common/date_test.go
@@ -0,0 +1,15 @@
+package common
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestTimeFromMiliseconds(t *testing.T) {
+	assert := assert.New(t)
+
+	next_day := Date{0x00, 0x00, 0x00, 0x00, 0x05, 0x26, 0x5c, 0x00}
+	go_time := next_day.Time()
+
+	assert.Equal(int64(86400), go_time.Unix(), "Date.Time() did not parse time in milliseconds")
+}
--- a/lib/common/destination.go
+++ b/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
+}
--- a/lib/common/fuzz/Dockerfile
+++ b/lib/common/fuzz/Dockerfile
@@ -0,0 +1,14 @@
+FROM golang
+
+RUN apt-get update && \
+    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
+RUN go get github.com/hkparker/go-i2p
+RUN go get github.com/ddollar/forego
+
+WORKDIR /go/src/github.com/hkparker/go-i2p
+
+ENTRYPOINT ["make", "fuzz"]
--- a/lib/common/fuzz/Makefile
+++ b/lib/common/fuzz/Makefile
@@ -0,0 +1,8 @@
+fuzz:
+	go-fuzz-build -o keys_and_cert/exportable-fuzz.zip github.com/hkparker/go-i2p/lib/common/fuzz/keys_and_cert
+	go-fuzz-build -o certificate/exportable-fuzz.zip github.com/hkparker/go-i2p/lib/common/fuzz/certificate
+	go-fuzz-build -o destination/exportable-fuzz.zip github.com/hkparker/go-i2p/lib/common/fuzz/destination
+	go-fuzz-build -o router_address/exportable-fuzz.zip github.com/hkparker/go-i2p/lib/common/fuzz/router_address
+	go-fuzz-build -o router_identity/exportable-fuzz.zip github.com/hkparker/go-i2p/lib/common/fuzz/router_identity
+	go-fuzz-build -o string/exportable-fuzz.zip github.com/hkparker/go-i2p/lib/common/fuzz/string
+	forego start
--- a/lib/common/fuzz/Procfile
+++ b/lib/common/fuzz/Procfile
@@ -0,0 +1,6 @@
+keys_and_cert: go-fuzz -bin=keys_and_cert/exportable-fuzz.zip -workdir=lib/common/fuzz/keys_and_cert -procs=2
+certificate: go-fuzz -bin=certificate/exportable-fuzz.zip -workdir=lib/common/fuzz/certificate -procs=2
+destination: go-fuzz -bin=destination/exportable-fuzz.zip -workdir=lib/common/fuzz/destination -procs=2
+router_address: go-fuzz -bin=router_address/exportable-fuzz.zip -workdir=lib/common/fuzz/router_address -procs=2
+router_identity: go-fuzz -bin=router_identity/exportable-fuzz.zip -workdir=lib/common/fuzz/router_identity -procs=2
+string: go-fuzz -bin=string/exportable-fuzz.zip -workdir=lib/common/fuzz/string -procs=2
--- a/lib/common/fuzz/certificate/corpus/1ef624482d620e43e6d34da1afe46267fc695d9b
+++ b/lib/common/fuzz/certificate/corpus/1ef624482d620e43e6d34da1afe46267fc695d9b
--- a/lib/common/fuzz/certificate/corpus/3949ab99dd419690fafea153a4ab82956ec2e9f5
+++ b/lib/common/fuzz/certificate/corpus/3949ab99dd419690fafea153a4ab82956ec2e9f5
--- a/lib/common/fuzz/certificate/corpus/3c7aeead1d941b685fe0958b19485f8e00c43d34
+++ b/lib/common/fuzz/certificate/corpus/3c7aeead1d941b685fe0958b19485f8e00c43d34
--- a/lib/common/fuzz/certificate/corpus/4cd0872139f7cae988acfce9a24e17a4c96897b6-1
+++ b/lib/common/fuzz/certificate/corpus/4cd0872139f7cae988acfce9a24e17a4c96897b6-1
--- a/lib/common/fuzz/certificate/corpus/5ba93c9db0cff93f52b521d7420e43f6eda2784f
+++ b/lib/common/fuzz/certificate/corpus/5ba93c9db0cff93f52b521d7420e43f6eda2784f
--- a/lib/common/fuzz/certificate/corpus/70b8bc8d904b1a29a6877833e647c543fa5e5679
+++ b/lib/common/fuzz/certificate/corpus/70b8bc8d904b1a29a6877833e647c543fa5e5679
--- a/lib/common/fuzz/certificate/corpus/9842926af7ca0a8cca12604f945414f07b01e13d
+++ b/lib/common/fuzz/certificate/corpus/9842926af7ca0a8cca12604f945414f07b01e13d
@@ -0,0 +1 @@
+
--- a/lib/common/fuzz/certificate/corpus/a7b38a4d7e82ebf894b495ebeb0f94d6b73b2669-1
+++ b/lib/common/fuzz/certificate/corpus/a7b38a4d7e82ebf894b495ebeb0f94d6b73b2669-1
--- a/lib/common/fuzz/certificate/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ b/lib/common/fuzz/certificate/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709
--- a/lib/common/fuzz/certificate/corpus/test-input-1
+++ b/lib/common/fuzz/certificate/corpus/test-input-1
--- a/lib/common/fuzz/certificate/corpus/test-input-10
+++ b/lib/common/fuzz/certificate/corpus/test-input-10
--- a/lib/common/fuzz/certificate/corpus/test-input-2
+++ b/lib/common/fuzz/certificate/corpus/test-input-2
--- a/lib/common/fuzz/certificate/corpus/test-input-3
+++ b/lib/common/fuzz/certificate/corpus/test-input-3
@@ -0,0 +1 @@
+
--- a/lib/common/fuzz/certificate/corpus/test-input-4
+++ b/lib/common/fuzz/certificate/corpus/test-input-4
--- a/lib/common/fuzz/certificate/corpus/test-input-5
+++ b/lib/common/fuzz/certificate/corpus/test-input-5
--- a/lib/common/fuzz/certificate/corpus/test-input-6
+++ b/lib/common/fuzz/certificate/corpus/test-input-6
--- a/lib/common/fuzz/certificate/corpus/test-input-7
+++ b/lib/common/fuzz/certificate/corpus/test-input-7
--- a/lib/common/fuzz/certificate/corpus/test-input-8
+++ b/lib/common/fuzz/certificate/corpus/test-input-8
--- a/lib/common/fuzz/certificate/corpus/test-input-9
+++ b/lib/common/fuzz/certificate/corpus/test-input-9
--- a/lib/common/fuzz/certificate/fuzz.go
+++ b/lib/common/fuzz/certificate/fuzz.go
@@ -0,0 +1,11 @@
+package exportable
+
+import "github.com/go-i2p/go-i2p/lib/common"
+
+func Fuzz(data []byte) int {
+	cert := common.Certificate(data)
+	cert.Data()
+	cert.Length()
+	cert.Type()
+	return 0
+}
--- a/lib/common/fuzz/destination/corpus/3832fe54a60281d245d8a17b992629bad4b5a6a9
+++ b/lib/common/fuzz/destination/corpus/3832fe54a60281d245d8a17b992629bad4b5a6a9
--- a/lib/common/fuzz/destination/corpus/3f29546453678b855931c174a97d6c0894b8f546
+++ b/lib/common/fuzz/destination/corpus/3f29546453678b855931c174a97d6c0894b8f546
--- a/lib/common/fuzz/destination/corpus/6d7aaa7d2bcca4a8758b398ab7617839203c828a
+++ b/lib/common/fuzz/destination/corpus/6d7aaa7d2bcca4a8758b398ab7617839203c828a
--- a/lib/common/fuzz/destination/corpus/9438e360f578e12c0e0e8ed28e2c125c1cefee16-1
+++ b/lib/common/fuzz/destination/corpus/9438e360f578e12c0e0e8ed28e2c125c1cefee16-1
--- a/lib/common/fuzz/destination/corpus/caadd9c955cc3f62f83e46cb762f3e9442cc0d05
+++ b/lib/common/fuzz/destination/corpus/caadd9c955cc3f62f83e46cb762f3e9442cc0d05
--- a/lib/common/fuzz/destination/corpus/corpus/46859acd63346200860afb148cb447e293c2837c-1
+++ b/lib/common/fuzz/destination/corpus/corpus/46859acd63346200860afb148cb447e293c2837c-1
--- a/lib/common/fuzz/destination/corpus/corpus/5ff31659ca03d5508285399652243143042abb20
+++ b/lib/common/fuzz/destination/corpus/corpus/5ff31659ca03d5508285399652243143042abb20
--- a/lib/common/fuzz/destination/corpus/corpus/6729889dd49c146eebb2fd69ab0560ab8c049c4b
+++ b/lib/common/fuzz/destination/corpus/corpus/6729889dd49c146eebb2fd69ab0560ab8c049c4b
--- a/lib/common/fuzz/destination/corpus/corpus/8dc00598417d4eb788a77ac6ccef3cb484905d8b
+++ b/lib/common/fuzz/destination/corpus/corpus/8dc00598417d4eb788a77ac6ccef3cb484905d8b
@@ -0,0 +1 @@
+
--- a/lib/common/fuzz/destination/corpus/corpus/93436ea60c5dcdd2e9893a025f560ab72422ae8c
+++ b/lib/common/fuzz/destination/corpus/corpus/93436ea60c5dcdd2e9893a025f560ab72422ae8c
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-1
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-1
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-128
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-128
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-128-1
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-128-1
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-128-2
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-128-2
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-128-3
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-128-3
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-2
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-2
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-256
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-256
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-256-1
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-256-1
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-256-2
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-256-2
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-256-3
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-256-3
--- a/lib/common/fuzz/destination/corpus/corpus/test-input-3
+++ b/lib/common/fuzz/destination/corpus/corpus/test-input-3
--- a/lib/common/fuzz/destination/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ b/lib/common/fuzz/destination/corpus/da39a3ee5e6b4b0d3255bfef95601890afd80709
--- a/lib/common/fuzz/destination/corpus/test-input-128-256-1
+++ b/lib/common/fuzz/destination/corpus/test-input-128-256-1
--- a/lib/common/fuzz/destination/corpus/test-input-128-256-2
+++ b/lib/common/fuzz/destination/corpus/test-input-128-256-2
--- a/lib/common/fuzz/destination/corpus/test-input-128-256-3
+++ b/lib/common/fuzz/destination/corpus/test-input-128-256-3
--- a/lib/common/fuzz/destination/fuzz.go
+++ b/lib/common/fuzz/destination/fuzz.go
@@ -0,0 +1,10 @@
+package exportable
+
+import "github.com/go-i2p/go-i2p/lib/common"
+
+func Fuzz(data []byte) int {
+	destination := common.Destination(data)
+	destination.Base32Address()
+	destination.Base64()
+	return 0
+}
--- a/lib/common/fuzz/keys_and_cert/corpus/46859acd63346200860afb148cb447e293c2837c-1
+++ b/lib/common/fuzz/keys_and_cert/corpus/46859acd63346200860afb148cb447e293c2837c-1
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
idk	836f287c9d	checkin this tialing thingamajig and abandon this branch	2022-04-25 16:03:22 -04:00
idk	d9543745a4	fix another test	2022-01-09 12:45:50 -05:00
idk	a87847ef51	Fix key_certificate parsing/construction from data	2021-10-25 21:02:45 -04:00
idk	bffc1dfe38	Setup up VSCodium	2021-10-22 17:17:55 -04:00
idk	c181a974cd	Fix some more tests, fix cert size check	2021-07-29 18:01:01 -04:00
idk	27547611ed	set fail-fast and get the rest of these tests	2021-07-28 08:09:30 -04:00
idk	3f4d02dc3e	fix cert readin	2021-07-27 12:55:03 -04:00
idk	6431100245	fix a whole bunch of faulty references I introduced when I had to backtrack and do the integer thing. Re-enable the tests I disabled to chase those references.	2021-07-27 12:46:11 -04:00
idk	e6b02ab341	Store Integer objects correctly	2021-07-27 11:42:46 -04:00
idk	53b629dd15	gofmt	2021-06-29 23:19:31 -04:00
idk	a576f0685f	clear up a couple more tests before bed	2021-06-29 23:18:58 -04:00
idk	fc0404a11a	Had to back-track through most of the common structures because I wrote the common structures Integer implementation incorrect.	2021-06-29 19:34:41 -04:00
idk	cfc3cc97ca	fix a test	2021-05-26 08:15:06 -04:00
idk	a3b83b5e1e	Make it so I can run the tests again on the parts I have converted so far	2021-05-21 19:12:49 -04:00
idk	4a9943de9b	More LeaseSet building fixes	2021-05-18 09:06:54 -04:00
idk	82ba9c1b68	More LeaseSet building fixes	2021-05-18 09:06:24 -04:00
idk	4f574a28d3	Construct some leasesets	2021-05-16 18:44:20 -04:00
idk	9d248eda5a	Update some more tests	2021-05-16 18:03:28 -04:00
idk	4f19c48da3	Update the checklist, clarify method for filling it in	2021-04-26 20:54:32 -04:00
idk	961dfe4266	Passing implementation of certificates	2021-04-25 02:25:43 -04:00
idk	afb38b6165	Passing implementation of certificates	2021-04-25 02:23:54 -04:00
idk	0aa32b4aad	start fixing up the tests on the new struct implementations	2021-04-25 02:09:12 -04:00
idk	3adf694c25	start fixing up the tests on the new struct implementations	2021-04-25 02:07:59 -04:00
idk	a11c3b73cb	start fixing up the tests on the new struct implementations	2021-04-25 02:06:57 -04:00
idk	853bc79f8f	start fixing up the tests on the new struct implementations	2021-04-24 23:23:29 -04:00
idk	77f1c6dd0a	start fixing up the tests on the new struct implementations	2021-04-24 22:48:48 -04:00
idk	ee7d8a0d63	OK before I go any further on this I should go back and check it against the tests.	2021-04-24 19:20:37 -04:00
idk	c253bf31ac	fix likely issue in ReadKeys	2021-04-24 18:36:57 -04:00
idk	b97b2854c1	add a stub file for leaseset2	2021-04-24 18:07:57 -04:00
idk	d5266f8980	finish structifying lease, add a stub file for lease2	2021-04-24 18:04:10 -04:00
idk	6de4dde1f2	Don't redundantly(and falsely) count the remainder when reading KeysAndCert	2021-04-24 16:25:21 -04:00
idk	648c05b15f	Make an interface of KeysAndCert	2021-04-24 16:05:23 -04:00
idk	bfc7237ba6	work on leasesets	2021-04-24 15:59:38 -04:00
idk	ffbdc7f967	Comment IntegerBytes	2021-04-24 15:35:08 -04:00
idk	1cd9d16760	Read in public and private keys when reading in keysandcert from a byte slice	2021-04-24 15:32:45 -04:00
idk	896df4e483	Update README.md with some of the plan	2021-04-22 23:49:00 -04:00
idk	49d7eeb441	Update README.md with some of the plan	2021-04-22 23:47:15 -04:00
idk	7893694c91	Update README.md with some of the plan	2021-04-22 23:47:04 -04:00
idk	1ea426da9c	Begin to convert the common structures from being byte-slice based to struct based	2021-04-22 22:55:32 -04:00