std: update content type enum

named-data · Feb 7, 2025 · acda197 · acda197
1 parent 13cab72
commit acda197
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/std/ndn/constants.go b/std/ndn/constants.go
@@ -7,11 +7,14 @@ const MaxNDNPacketSize = 8800
 type ContentType uint64
 
 const (
-	ContentTypeBlob   ContentType = 0
-	ContentTypeLink   ContentType = 1
-	ContentTypeKey    ContentType = 2
-	ContentTypeNack   ContentType = 3
-	ContentTypeSigKey ContentType = 9
+	ContentTypeBlob               ContentType = 0
+	ContentTypeLink               ContentType = 1
+	ContentTypeKey                ContentType = 2
+	ContentTypeNack               ContentType = 3
+	ContentTypeManifest           ContentType = 4
+	ContentTypePrefixAnnouncement ContentType = 5
+	ContentTypeEncapsulatedData   ContentType = 6
+	ContentTypeSigningKey         ContentType = 9
 )
 
 // SigType represents the type of signature.

diff --git a/std/security/certificate.go b/std/security/certificate.go
@@ -128,7 +128,7 @@ func getPubKey(data ndn.Data) ([]byte, enc.Name, error) {
 			return nil, nil, err
 		}
 		return pub, keyName, nil
-	case ndn.ContentTypeSigKey:
+	case ndn.ContentTypeSigningKey:
 		// Content is private key, parse the signer
 		signer, err := sig.UnmarshalSecret(data)
 		if err != nil {

diff --git a/std/security/decode_file.go b/std/security/decode_file.go
@@ -47,7 +47,7 @@ func DecodeFile(content []byte) (signers []ndn.Signer, certs [][]byte, err error
 		switch contentType {
 		case ndn.ContentTypeKey: // cert
 			certs = append(certs, wire)
-		case ndn.ContentTypeSigKey: // key
+		case ndn.ContentTypeSigningKey: // key
 			key, err := sig.UnmarshalSecret(data)
 			if err != nil || key == nil {
 				log.Warn(nil, "Failed to decode key", "name", data.Name(), "err", err)

diff --git a/std/security/pem.go b/std/security/pem.go
@@ -58,7 +58,7 @@ func PemEncode(raw []byte) ([]byte, error) {
 	switch contentType {
 	case ndn.ContentTypeKey:
 		pemType = PEM_TYPE_CERT
-	case ndn.ContentTypeSigKey:
+	case ndn.ContentTypeSigningKey:
 		pemType = PEM_TYPE_SECRET
 	default:
 		return nil, fmt.Errorf("unsupported content type")

diff --git a/std/security/signer/marshal.go b/std/security/signer/marshal.go
@@ -39,7 +39,7 @@ func MarshalSecret(key ndn.Signer) (enc.Wire, error) {
 
 	// Encode key data packet
 	cfg := &ndn.DataConfig{
-		ContentType: optional.Some(ndn.ContentTypeSigKey),
+		ContentType: optional.Some(ndn.ContentTypeSigningKey),
 	}
 	data, err := spec.Spec{}.MakeData(name, cfg, enc.Wire{sk}, key)
 	if err != nil {
@@ -52,7 +52,7 @@ func MarshalSecret(key ndn.Signer) (enc.Wire, error) {
 // UnmarshalSecret decodes a signed NDN Data packet to a key secret.
 func UnmarshalSecret(data ndn.Data) (ndn.Signer, error) {
 	// Check data content type
-	if ctype, ok := data.ContentType().Get(); !ok || ctype != ndn.ContentTypeSigKey {
+	if ctype, ok := data.ContentType().Get(); !ok || ctype != ndn.ContentTypeSigningKey {
 		return nil, ndn.ErrInvalidValue{Item: "content type"}
 	}
 

diff --git a/std/security/signer/marshal_test.go b/std/security/signer/marshal_test.go
@@ -50,7 +50,7 @@ func TestMarshalSecret(t *testing.T) {
 	// check output data
 	data, _, err := spec.Spec{}.ReadData(enc.NewWireView(wire))
 	require.NoError(t, err)
-	require.Equal(t, ndn.ContentTypeSigKey, data.ContentType().Unwrap())
+	require.Equal(t, ndn.ContentTypeSigningKey, data.ContentType().Unwrap())
 	require.Equal(t, RSA_KEY_NAME, data.Name())
 	require.Equal(t, secret, data.Content().Join())
 }