fixed the TODOs ,notations and comments

openconfig · Jan 16, 2025 · dedd685 · dedd685
1 parent 775a0e1
commit dedd685
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/feature/security/gnsi/certz/test_data/README.md b/feature/security/gnsi/certz/test_data/README.md
@@ -14,6 +14,8 @@ Creation of test data for use in TLS tests.
    * server_cert.cnf/server_cert_ext.cnf - server openssl profile configuration
    * client_cert.cnf/client_cert_ext.cnf - client openssl profile configuration
 
+## TODO:Perform this for the permutations of 20000 CA trust_bundle configurations
+
 Each CA set includes, for both RSA and ECDSA signature types:
   * CA key
   * CA public certificate

diff --git a/feature/security/gnsi/certz/tests/client_certificates/README.md b/feature/security/gnsi/certz/tests/client_certificates/README.md
@@ -8,6 +8,7 @@ identification information. The client certificate should have a
 SPIFFE Idenitifier embedded in it to be used as the identifier of
 the client to the server.
 
+
 ## Baseline Setup
 
 ### Input Args
@@ -42,8 +43,11 @@ gRPC service.
 
 Perform this for both RSA and ECDSA signed CA bundles and
 certificates.
-Perform this for the permutations of 1, 2, 10, 1000, 20000 CA
-trust_bundle configurations: (## indicates the 1, 2, 10, 1000, 20000 CA testdata)
+
+## TODO:Perform this for the permutations of 20000 CA
+## TODO:trust_bundle configurations: ( 20000 CA testdata)
+Perform this for the permutations of 1, 2, 10, 1000 CA
+trust_bundle configurations: (## indicates the 1, 2, 10, 1000 CA testdata)
 
    1) Load the correct key-type trust bundle onto the device and client system:
         ca-##/trust_bundle_##_rsa.pem

diff --git a/feature/security/gnsi/certz/tests/client_certificates/client_certificates_test.go b/feature/security/gnsi/certz/tests/client_certificates/client_certificates_test.go
@@ -14,7 +14,7 @@
 package client_certificates_test
 
 import (
-	context "context"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"os"

diff --git a/feature/security/gnsi/certz/tests/internal/setup_service/setup_service.go b/feature/security/gnsi/certz/tests/internal/setup_service/setup_service.go
@@ -18,7 +18,7 @@
 package setupservice
 
 import (
-	context "context"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/pem"
@@ -147,16 +147,20 @@ func CreateCertzChain(t *testing.T, certData CertificateChainRequest) certzpb.Ce
 				t.Fatalf("Error reading Server Key file at: %v with error: %v", certData.ServerKeyFile, err)
 			}
 			return certzpb.CertificateChain{Certificate: &certzpb.Certificate{
-				Type:        certzpb.CertificateType_CERTIFICATE_TYPE_X509,
-				Encoding:    certzpb.CertificateEncoding_CERTIFICATE_ENCODING_PEM,
-				Certificate: serverCertContent,
-				PrivateKey:  serverKeyContent}, Parent: nil}
+				Type:            certzpb.CertificateType_CERTIFICATE_TYPE_X509,
+				Encoding:        certzpb.CertificateEncoding_CERTIFICATE_ENCODING_PEM,
+				Certificate:     serverCertContent,
+				PrivateKey:      serverKeyContent,
+				PrivateKeyType:  &certzpb.Certificate_RawPrivateKey{RawPrivateKey: serverKeyContent},
+				CertificateType: &certzpb.Certificate_RawCertificate{RawCertificate: serverCertContent}}, Parent: nil}
 		}
 		return certzpb.CertificateChain{Certificate: &certzpb.Certificate{
-			Type:        certzpb.CertificateType_CERTIFICATE_TYPE_X509,
-			Encoding:    certzpb.CertificateEncoding_CERTIFICATE_ENCODING_PEM,
-			Certificate: serverCertContent,
-			PrivateKey:  nil}, Parent: nil}
+			Type:            certzpb.CertificateType_CERTIFICATE_TYPE_X509,
+			Encoding:        certzpb.CertificateEncoding_CERTIFICATE_ENCODING_PEM,
+			Certificate:     serverCertContent,
+			PrivateKey:      nil,
+			PrivateKeyType:  nil,
+			CertificateType: &certzpb.Certificate_RawCertificate{RawCertificate: serverCertContent}}, Parent: nil}
 
 	case EntityTypeTrustBundle:
 		if len(certData.TrustBundleFile) == 0 {