luzifer/go-dhparam
1
0
Fork 0
mirror of https://github.com/Luzifer/go-dhparam.git synced 2024-12-23 20:41:21 +00:00
Code Issues Releases Wiki Activity

Switch to enum Generator value

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2018-10-08 11:33:53 +02:00
parent e455b62327
commit bfc3f9d72b
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
generator.go
View file

@ -21,6 +21,16 @@ const (
GeneratorSafePrimeFound GeneratorSafePrimeFound
) )
// Generator is the generator number to use when determining the prime number
type Generator int
const (
// GeneratorTwo uses a generator 2
GeneratorTwo Generator = 2
// GeneratorFive uses a generator 5
GeneratorFive = 5
)
// 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)
@ -28,10 +38,10 @@ func nullCallback(r 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 possible. // 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, generator int, cb GeneratorCallback) (*DH, error) { func Generate(bits int, generator Generator, cb GeneratorCallback) (*DH, error) {
var ( var (
err error err error
padd, rem int64 padd, rem int64
@ -79,7 +89,7 @@ func Generate(bits, generator int, cb GeneratorCallback) (*DH, error) {
return &DH{ return &DH{
P: prime, P: prime,
G: generator, G: int(generator),
}, nil }, nil
} }

10
generator_test.go
View file

@ -8,7 +8,7 @@ import (
"testing" "testing"
) )
func execGeneratorIntegration(t *testing.T, bitsize, generator int) { func execGeneratorIntegration(t *testing.T, bitsize int, generator Generator) {
dh, err := Generate(bitsize, generator, nil) dh, err := Generate(bitsize, generator, nil)
if err != nil { if err != nil {
t.Fatalf("Unable to generate DH params: %s", err) t.Fatalf("Unable to generate DH params: %s", err)
@ -50,17 +50,17 @@ func execGeneratorIntegration(t *testing.T, bitsize, generator int) {
} }
func TestGenerator512bit(t *testing.T) { func TestGenerator512bit(t *testing.T) {
execGeneratorIntegration(t, 512, 2) execGeneratorIntegration(t, 512, GeneratorTwo)
} }
func TestGenerator1024bit(t *testing.T) { func TestGenerator1024bit(t *testing.T) {
execGeneratorIntegration(t, 1024, 2) execGeneratorIntegration(t, 1024, GeneratorTwo)
} }
func TestGenerator2048bit(t *testing.T) { func TestGenerator2048bit(t *testing.T) {
execGeneratorIntegration(t, 2048, 2) execGeneratorIntegration(t, 2048, GeneratorTwo)
} }
func TestGenerator5(t *testing.T) { func TestGenerator5(t *testing.T) {
execGeneratorIntegration(t, 512, 5) execGeneratorIntegration(t, 512, GeneratorFive)
} }