This involves adding a new function |DH_compute_key_hashed| that combines the FFDH with the output hashing inside the FIPS module. This new function uses the padded FFDH output, as newly specified in SP 800-56Ar3. Change-Id: Iafcb7e276f16d39bf7d25d3b2f163b5cd6f67883 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/44504 Reviewed-by: David Benjamin <davidben@google.com>chromium-5359
Adam Langley
4 years ago
committed by
Adam Langley
parent
ce7f08827d
commit
28cab640d1
6 changed files with 366 additions and 30 deletions
@ -0,0 +1,179 @@ |
||||
// Copyright (c) 2020, Google Inc.
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||
// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
||||
// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
package subprocess |
||||
|
||||
import ( |
||||
"bytes" |
||||
"encoding/hex" |
||||
"encoding/json" |
||||
"fmt" |
||||
) |
||||
|
||||
type kasDHVectorSet struct { |
||||
Groups []kasDHTestGroup `json:"testGroups"` |
||||
} |
||||
|
||||
type kasDHTestGroup struct { |
||||
ID uint64 `json:"tgId"` |
||||
Type string `json:"testType"` |
||||
Role string `json:"kasRole"` |
||||
Mode string `json:"kasMode"` |
||||
Hash string `json:"hashAlg"` |
||||
Scheme string `json:"scheme"` |
||||
PHex string `json:"p"` |
||||
QHex string `json:"q"` |
||||
GHex string `json:"g"` |
||||
Tests []kasDHTest `json:"tests"` |
||||
} |
||||
|
||||
type kasDHTest struct { |
||||
ID uint64 `json:"tcId"` |
||||
PeerPublicHex string `json:"ephemeralPublicServer"` |
||||
PrivateKeyHex string `json:"ephemeralPrivateIut"` |
||||
PublicKeyHex string `json:"ephemeralPublicIut"` |
||||
ResultHex string `json:"hashZIut"` |
||||
} |
||||
|
||||
type kasDHTestGroupResponse struct { |
||||
ID uint64 `json:"tgId"` |
||||
Tests []kasDHTestResponse `json:"tests"` |
||||
} |
||||
|
||||
type kasDHTestResponse struct { |
||||
ID uint64 `json:"tcId"` |
||||
LocalPublicHex string `json:"ephemeralPublicIut,omitempty"` |
||||
ResultHex string `json:"hashZIut,omitempty"` |
||||
Passed *bool `json:"testPassed,omitempty"` |
||||
} |
||||
|
||||
type kasDH struct{} |
||||
|
||||
func (k *kasDH) Process(vectorSet []byte, m Transactable) (interface{}, error) { |
||||
var parsed kasDHVectorSet |
||||
if err := json.Unmarshal(vectorSet, &parsed); err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
// See https://usnistgov.github.io/ACVP/draft-fussell-acvp-kas-ffc.html
|
||||
var ret []kasDHTestGroupResponse |
||||
for _, group := range parsed.Groups { |
||||
response := kasDHTestGroupResponse{ |
||||
ID: group.ID, |
||||
} |
||||
|
||||
var privateKeyGiven bool |
||||
switch group.Type { |
||||
case "AFT": |
||||
privateKeyGiven = false |
||||
case "VAL": |
||||
privateKeyGiven = true |
||||
default: |
||||
return nil, fmt.Errorf("unknown test type %q", group.Type) |
||||
} |
||||
|
||||
switch group.Hash { |
||||
case "SHA2-224", "SHA2-256", "SHA2-384", "SHA2-512": |
||||
break |
||||
default: |
||||
return nil, fmt.Errorf("unknown hash function %q", group.Hash) |
||||
} |
||||
|
||||
switch group.Role { |
||||
case "initiator", "responder": |
||||
break |
||||
default: |
||||
return nil, fmt.Errorf("unknown role %q", group.Role) |
||||
} |
||||
|
||||
if group.Scheme != "dhEphem" { |
||||
return nil, fmt.Errorf("unknown scheme %q", group.Scheme) |
||||
} |
||||
|
||||
p, err := hex.DecodeString(group.PHex) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
q, err := hex.DecodeString(group.QHex) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
g, err := hex.DecodeString(group.GHex) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
method := "FFDH/" + group.Hash |
||||
|
||||
for _, test := range group.Tests { |
||||
if len(test.PeerPublicHex) == 0 { |
||||
return nil, fmt.Errorf("%d/%d is missing peer's key", group.ID, test.ID) |
||||
} |
||||
|
||||
peerPublic, err := hex.DecodeString(test.PeerPublicHex) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
if (len(test.PrivateKeyHex) != 0) != privateKeyGiven { |
||||
return nil, fmt.Errorf("%d/%d incorrect private key presence", group.ID, test.ID) |
||||
} |
||||
|
||||
if privateKeyGiven { |
||||
privateKey, err := hex.DecodeString(test.PrivateKeyHex) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
publicKey, err := hex.DecodeString(test.PublicKeyHex) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
expectedOutput, err := hex.DecodeString(test.ResultHex) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
result, err := m.Transact(method, 2, p, q, g, peerPublic, privateKey, publicKey) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
ok := bytes.Equal(result[1], expectedOutput) |
||||
response.Tests = append(response.Tests, kasDHTestResponse{ |
||||
ID: test.ID, |
||||
Passed: &ok, |
||||
}) |
||||
} else { |
||||
result, err := m.Transact(method, 2, p, q, g, peerPublic, nil, nil) |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
response.Tests = append(response.Tests, kasDHTestResponse{ |
||||
ID: test.ID, |
||||
LocalPublicHex: hex.EncodeToString(result[0]), |
||||
ResultHex: hex.EncodeToString(result[1]), |
||||
}) |
||||
} |
||||
} |
||||
|
||||
ret = append(ret, response) |
||||
} |
||||
|
||||
return ret, nil |
||||
} |
||||
Loading…
Reference in new issue