From b5bf40450de4d4aaf13225a9d245e33c8af7db70 Mon Sep 17 00:00:00 2001
From: Paul Duncan <pabs@pablotron.org>
Date: Mon, 7 Feb 2022 12:19:10 -0500
Subject: s/v2Scores/Scores/

---
 cvss/v2scores.go | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'cvss/v2scores.go')

diff --git a/cvss/v2scores.go b/cvss/v2scores.go
index 990b805..3100b19 100644
--- a/cvss/v2scores.go
+++ b/cvss/v2scores.go
@@ -4,43 +4,43 @@ import (
   "math"
 )
 
-// CVSS v2 base, temporal, and environmental scores.
-type v2Scores struct {
-  base      Score // base score
-  temporal  Score // temporal score
-  env       Score // environmental score
+// CVSS score set.
+type Scores struct {
+  Base      Score `json:"base"`     // base score
+  Temporal  Score `json:"temporal"` // temporal score
+  Env       Score `json:"env"`      // environmental score
 }
 
-// Create new CVSS v2Scores from floats.
-func newV2ScoresFromFloats(base, temporal, env float64) (v2Scores, error) {
+// Create new score set from floats.
+func NewScores(base, temporal, env float64) (Scores, error) {
   // convert base from float to Score
   baseScore, err := NewScore(base)
   if err != nil {
-    return v2Scores{}, err
+    return Scores{}, err
   }
 
   // convert temporal from float to Score
   tempScore, err := NewScore(temporal)
   if err != nil {
-    return v2Scores{}, err
+    return Scores{}, err
   }
 
   // convert env from float to Score
   envScore, err := NewScore(env)
   if err != nil {
-    return v2Scores{}, err
+    return Scores{}, err
   }
 
   // return success
-  return v2Scores {
-    base: baseScore,
-    temporal: tempScore,
-    env: envScore,
+  return Scores {
+    Base: baseScore,
+    Temporal: tempScore,
+    Env: envScore,
   }, nil
 }
 
 // Create new v2 scores from v2 vector.
-func newV2Scores(v v2Vector) (v2Scores, error) {
+func newScoresFromV2Vector(v v2Vector) (Scores, error) {
   // CVSS v2 (https://www.first.org/cvss/v2/guide 3.2.1)
   //
   // Impact = 10.41*(1-(1-ConfImpact)*(1-IntegImpact)*(1-AvailImpact))
@@ -262,5 +262,5 @@ func newV2Scores(v v2Vector) (v2Scores, error) {
   }
 
   // build and return result
-  return newV2ScoresFromFloats(baseScore, tempScore, envScore)
+  return NewScores(baseScore, tempScore, envScore)
 }
-- 
cgit v1.2.3