Modified values.OID (ECC)

Author: spiegel-im-spiegel

packet/values/ecc.go

@@ -13,9 +13,13 @@ import (
 type OID []byte
 
 var oidList = map[string][]byte{
-	"NIST curve P-256": {0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07},
-	"NIST curve P-384": {0x2b, 0x81, 0x04, 0x00, 0x22},
-	"NIST curve P-521": {0x2b, 0x81, 0x04, 0x00, 0x23},
+	"NIST P-256":      {0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07},
+	"NIST P-384":      {0x2b, 0x81, 0x04, 0x00, 0x22},
+	"NIST P-521":      {0x2b, 0x81, 0x04, 0x00, 0x23},
+	"brainpoolP256r1": {0x2B, 0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x07},
+	"brainpoolP512r1": {0x2B, 0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x0D},
+	"Ed25519":         {0x2B, 0x06, 0x01, 0x04, 0x01, 0xDA, 0x47, 0x0F, 0x01},
+	"Curve25519":      {0x2B, 0x06, 0x01, 0x04, 0x01, 0x97, 0x55, 0x01, 0x05, 0x01},
 }
 
 //NewOID returns OID instance
@@ -81,7 +85,7 @@ func (ep ECParm) ToItem(name string, dumpFlag bool) *info.Item {
 	)
 }
 
-/* Copyright 2016 Spiegel
+/* Copyright 2016,2017 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packet/values/ecc_test.go

@@ -11,7 +11,7 @@ import (
 func TestEccNITSP256(t *testing.T) {
 	data := []byte{0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07}
 	dump := "2a 86 48 ce 3d 03 01 07"
-	note := "NIST curve P-256"
+	note := "NIST P-256"
 	reader := reader.New(data)
 	oid, err := NewOID(reader)
 	if err != nil {
@@ -35,7 +35,7 @@ func TestEccNITSP256(t *testing.T) {
 func TestEccNITSP384(t *testing.T) {
 	data := []byte{0x05, 0x2b, 0x81, 0x04, 0x00, 0x22}
 	dump := "2b 81 04 00 22"
-	note := "NIST curve P-384"
+	note := "NIST P-384"
 	reader := reader.New(data)
 	oid, err := NewOID(reader)
 	if err != nil {
@@ -59,7 +59,7 @@ func TestEccNITSP384(t *testing.T) {
 func TestEccNITSP521(t *testing.T) {
 	data := []byte{0x05, 0x2b, 0x81, 0x04, 0x00, 0x23}
 	dump := "2b 81 04 00 23"
-	note := "NIST curve P-521"
+	note := "NIST P-521"
 	reader := reader.New(data)
 	oid, err := NewOID(reader)
 	if err != nil {