1
0
mirror of https://github.com/Luzifer/go-dhparam.git synced 2024-09-19 16:42:57 +00:00

Update minimum Go version and use stdlib error-wrapping (#3)

This commit is contained in:
Peter Reisinger 2023-02-10 15:45:24 +00:00 committed by GitHub
parent 7398a93ea6
commit 7ca3a8cf19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 19 deletions

7
dh.go
View File

@ -4,9 +4,8 @@ import (
"bytes" "bytes"
"encoding/asn1" "encoding/asn1"
"encoding/pem" "encoding/pem"
"fmt"
"math/big" "math/big"
"github.com/pkg/errors"
) )
// DH contains a prime (P) and a generator (G) number representing the DH parameters // DH contains a prime (P) and a generator (G) number representing the DH parameters
@ -21,7 +20,7 @@ func Decode(pemData []byte) (*DH, error) {
out := &DH{} out := &DH{}
if _, err := asn1.Unmarshal(blk.Bytes, out); err != nil { if _, err := asn1.Unmarshal(blk.Bytes, out); err != nil {
return nil, errors.Wrap(err, "Could not unmarshal ASN1") return nil, fmt.Errorf("could not unmarshal ASN1: %w", err)
} }
return out, nil return out, nil
@ -31,7 +30,7 @@ func Decode(pemData []byte) (*DH, error) {
func (d DH) ToPEM() ([]byte, error) { func (d DH) ToPEM() ([]byte, error) {
data, err := asn1.Marshal(d) data, err := asn1.Marshal(d)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Unable to marshal ASN1 data") return nil, fmt.Errorf("unable to marshal ASN1 data: %w", err)
} }
buf := new(bytes.Buffer) buf := new(bytes.Buffer)

View File

@ -3,9 +3,8 @@ package dhparam
import ( import (
"context" "context"
"crypto/rand" "crypto/rand"
"fmt"
"math/big" "math/big"
"github.com/pkg/errors"
) )
const pemHeader = "DH PARAMETERS" const pemHeader = "DH PARAMETERS"
@ -35,12 +34,12 @@ const (
// GeneratorCallback is a type of function to receive GeneratorResults while the prime number is determined // GeneratorCallback is a type of function to receive GeneratorResults while the prime number is determined
type GeneratorCallback func(r GeneratorResult) type GeneratorCallback func(r GeneratorResult)
func nullCallback(r GeneratorResult) {} func nullCallback(_ GeneratorResult) {}
// Generate determines a prime number according to the generator having the specified number of bits // Generate determines a prime number according to the generator having the specified number of bits
// //
// In OpenSSL defined generators are 2 and 5. Others are supported but the verification is not supported in an extend as with generators 2 and 5. // In OpenSSL defined generators are 2 and 5. Others are supported but the verification is not supported in an extend as with generators 2 and 5.
// The bit size should be adjusted to be high enough for the current requirements. Also you should keep // The bit size should be adjusted to be high enough for the current requirements. Also, you should keep
// in mind the higher the bitsize, the longer the generation might take. // in mind the higher the bitsize, the longer the generation might take.
func Generate(bits int, generator Generator, cb GeneratorCallback) (*DH, error) { func Generate(bits int, generator Generator, cb GeneratorCallback) (*DH, error) {
// Invoke GenerateWithContext with a background context // Invoke GenerateWithContext with a background context
@ -154,14 +153,14 @@ func genRand(bits int) (*big.Int, error) {
buf := make([]byte, bytes) buf := make([]byte, bytes)
if _, err := rand.Read(buf); err != nil { if _, err := rand.Read(buf); err != nil {
return nil, errors.Wrap(err, "Unable to read random") return nil, fmt.Errorf("unable to read random: %w", err)
} }
if bit == 0 { if bit == 0 {
buf[0] = 1 buf[0] = 1
buf[1] |= 0x80 buf[1] |= 0x80
} else { } else {
buf[0] |= (3 << uint(bit-1)) buf[0] |= 3 << uint(bit-1)
} }
buf[0] &= byte(^mask) buf[0] &= byte(^mask)

View File

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
@ -36,7 +35,7 @@ func execGeneratorIntegration(t *testing.T, bitsize int, generator Generator) {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
f, err := ioutil.TempFile("", "dhparam.*") f, err := os.CreateTemp("", "dhparam.*")
if err != nil { if err != nil {
t.Fatalf("Unable to create tempfile: %s", err) t.Fatalf("Unable to create tempfile: %s", err)
} }

4
go.mod
View File

@ -1,5 +1,3 @@
module github.com/Luzifer/go-dhparam module github.com/Luzifer/go-dhparam
go 1.14 go 1.19
require github.com/pkg/errors v0.9.1

2
go.sum
View File

@ -1,2 +0,0 @@
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

View File

@ -3,7 +3,7 @@ package dhparam
import ( import (
"math/big" "math/big"
"github.com/pkg/errors" "errors"
) )
const dhCheckPNotPrime = 0x01 const dhCheckPNotPrime = 0x01
@ -23,7 +23,7 @@ var ErrAllParametersOK = errors.New("DH parameters appear to be ok")
// one error not being equal to ErrAllParametersOK. // one error not being equal to ErrAllParametersOK.
func (d DH) Check() ([]error, bool) { func (d DH) Check() ([]error, bool) {
var ( var (
result = []error{} result []error
ok = true ok = true
) )