更新

Author: deatil

pkcs12/p12_encode.go

@@ -112,6 +112,35 @@ func (this *PKCS12) AddSecretKey(secretKey []byte) {
 
 // ===============
 
+func (this *PKCS12) makeFriendlyNameAttr(friendlyName string) (PKCS12Attribute, error) {
+    bmpFriendlyName, err := bmpString(friendlyName)
+    if err != nil {
+        return PKCS12Attribute{}, err
+    }
+
+    encodedFriendlyName, err := asn1.Marshal(asn1.RawValue{
+        Class:      0,
+        Tag:        30,
+        IsCompound: false,
+        Bytes:      bmpFriendlyName,
+    })
+    if err != nil {
+        return PKCS12Attribute{}, err
+    }
+
+    friendlyNameAttr := PKCS12Attribute{
+        Id: oidFriendlyName,
+        Value: asn1.RawValue{
+            Class:      0,
+            Tag:        17,
+            IsCompound: true,
+            Bytes:      encodedFriendlyName,
+        },
+    }
+
+    return friendlyNameAttr, nil
+}
+
 func (this *PKCS12) makeLocalKeyIdAttr(data []byte) (PKCS12Attribute, error) {
     var fingerprint []byte
 
@@ -232,34 +261,12 @@ func (this *PKCS12) marshalTrustStoreEntries(rand io.Reader, password []byte, op
 
     var certBags []SafeBag
     for _, entry := range entries {
-
-        bmpFriendlyName, err1 := bmpString(entry.FriendlyName)
-        if err1 != nil {
-            err = err1
-            return
-        }
-
-        encodedFriendlyName, err1 := asn1.Marshal(asn1.RawValue{
-            Class:      0,
-            Tag:        30,
-            IsCompound: false,
-            Bytes:      bmpFriendlyName,
-        })
+        friendlyName, err1 := this.makeFriendlyNameAttr(entry.FriendlyName)
         if err1 != nil {
             err = err1
             return
         }
 
-        friendlyName := PKCS12Attribute{
-            Id: oidFriendlyName,
-            Value: asn1.RawValue{
-                Class:      0,
-                Tag:        17,
-                IsCompound: true,
-                Bytes:      encodedFriendlyName,
-            },
-        }
-
         certBag, err1 := NewCertBagEntry().MakeCertBag(entry.Cert, append(certAttributes, friendlyName))
         if err1 != nil {
             err = err1