From d7f3708f0e2d3f9e0cba20404a1694d4fc9dd125 Mon Sep 17 00:00:00 2001
From: deatil <2217957370@qq.com>
Date: Sat, 6 May 2023 11:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/example/controller/data.go                |  2 +-
 app/example/key/key_pkcs12.go                 | 20 -------------------
 .../go-cryptobin/pkcs8pbe/helper.go           | 17 ++++++++--------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/app/example/controller/data.go b/app/example/controller/data.go
index 68443bf5..c1de7b0c 100644
--- a/app/example/controller/data.go
+++ b/app/example/controller/data.go
@@ -453,7 +453,7 @@ func (this *Data) Error(ctx *gin.Context) {
         bksErrData = bksErr.Error()
     }
 
-    key.ShowBerP12_2()
+    // key.ShowBerP12()
     // key.MakePKCS12_2()
 
     // 事件
diff --git a/app/example/key/key_pkcs12.go b/app/example/key/key_pkcs12.go
index e358f53b..f04f8320 100644
--- a/app/example/key/key_pkcs12.go
+++ b/app/example/key/key_pkcs12.go
@@ -20,7 +20,6 @@ import (
     pkcs7_ber "github.com/deatil/go-cryptobin/pkcs7/ber"
     cryptobin_rsa "github.com/deatil/go-cryptobin/cryptobin/rsa"
     cryptobin_pkcs12 "github.com/deatil/go-cryptobin/pkcs12"
-    cryptobin_pkcs12ber "github.com/deatil/go-cryptobin/pkcs12ber"
 )
 
 type Errs struct{
@@ -631,22 +630,3 @@ func ShowBerP12() {
     fmt.Println("")
 }
 
-func ShowBerP12_2() {
-    fs := filesystem.New()
-    p12, _ := fs.Get("./runtime/p12/testSM20210913-12345678.pfx")
-
-    priv, cert, err := cryptobin_pkcs12ber.Decode([]byte(p12), "12345678")
-    if err != nil {
-        fmt.Println("err =====")
-        fmt.Println(err.Error())
-        fmt.Println("")
-    }
-
-    fmt.Println("cert =====")
-    fmt.Printf("%#v", cert)
-    fmt.Println("")
-
-    fmt.Println("priv =====")
-    fmt.Printf("%#v", priv)
-    fmt.Println("")
-}
diff --git a/pkg/lakego-pkg/go-cryptobin/pkcs8pbe/helper.go b/pkg/lakego-pkg/go-cryptobin/pkcs8pbe/helper.go
index 9d2e89e2..b648fa3e 100644
--- a/pkg/lakego-pkg/go-cryptobin/pkcs8pbe/helper.go
+++ b/pkg/lakego-pkg/go-cryptobin/pkcs8pbe/helper.go
@@ -2,20 +2,21 @@ package pkcs8pbe
 
 // PEMCipher 列表
 var PEMCipherMap = map[string]PEMCipher{
-    "MD2AndDES":      PEMCipherMD2AndDES,
-    "MD5AndDES":      PEMCipherMD5AndDES,
-    "SHA1AndDES":     PEMCipherSHA1AndDES,
-    "SHA1And2DES":    PEMCipherSHA1And2DES,
+    // pcks12 模式
     "SHA1And3DES":    PEMCipherSHA1And3DES,
-
+    "SHA1And2DES":    PEMCipherSHA1And2DES,
+    "SHA1AndRC2_128": PEMCipherSHA1AndRC2_128,
+    "SHA1AndRC2_40":  PEMCipherSHA1AndRC2_40,
     "SHA1AndRC4_128": PEMCipherSHA1AndRC4_128,
     "SHA1AndRC4_40":  PEMCipherSHA1AndRC4_40,
 
-    "SHA1AndRC2_40":  PEMCipherSHA1AndRC2_40,
-    "SHA1AndRC2_64":  PEMCipherSHA1AndRC2_64,
-    "SHA1AndRC2_128": PEMCipherSHA1AndRC2_128,
+    // pkcs5-v1.5 模式
+    "MD2AndDES":      PEMCipherMD2AndDES,
     "MD2AndRC2_64":   PEMCipherMD2AndRC2_64,
+    "MD5AndDES":      PEMCipherMD5AndDES,
     "MD5AndRC2_64":   PEMCipherMD5AndRC2_64,
+    "SHA1AndDES":     PEMCipherSHA1AndDES,
+    "SHA1AndRC2_64":  PEMCipherSHA1AndRC2_64,
 }
 
 // 获取 Cipher 类型