From 1cf8782870393acca88ff4753013f2969c32ea86 Mon Sep 17 00:00:00 2001 From: Sun Yimin Date: Mon, 9 Dec 2024 19:54:01 +0800 Subject: [PATCH] pkcs7: fallback change --- pkcs7/pkcs7_test.go | 2 +- pkcs7/sign_enveloped_test.go | 12 ++++++------ pkcs7/sign_test.go | 10 +++++----- pkcs7/verify_test.go | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkcs7/pkcs7_test.go b/pkcs7/pkcs7_test.go index 9ee4c30..0592635 100644 --- a/pkcs7/pkcs7_test.go +++ b/pkcs7/pkcs7_test.go @@ -83,7 +83,7 @@ func fromBase10(base10 string) *big.Int { type certKeyPair struct { Certificate *smx509.Certificate - PrivateKey crypto.PrivateKey + PrivateKey *crypto.PrivateKey } func createTestCertificate(sigAlg x509.SignatureAlgorithm, allCA bool) (certKeyPair, error) { diff --git a/pkcs7/sign_enveloped_test.go b/pkcs7/sign_enveloped_test.go index 56c3035..47c4734 100644 --- a/pkcs7/sign_enveloped_test.go +++ b/pkcs7/sign_enveloped_test.go @@ -171,7 +171,7 @@ func TestCreateSignedEvnvelopedDataSM(t *testing.T) { t.Fatal(err) } privKey := make([]byte, 32) - sm2Key, ok := (encryptKey.PrivateKey).(*sm2.PrivateKey) + sm2Key, ok := (*encryptKey.PrivateKey).(*sm2.PrivateKey) if !ok { t.Fatal("should be sm2 private key") } @@ -183,7 +183,7 @@ func TestCreateSignedEvnvelopedDataSM(t *testing.T) { if err != nil { t.Fatal(err) } - err = saed.AddSigner(rootCert.Certificate, rootCert.PrivateKey) + err = saed.AddSigner(rootCert.Certificate, *rootCert.PrivateKey) if err != nil { t.Fatal(err) } @@ -203,7 +203,7 @@ func TestCreateSignedEvnvelopedDataSM(t *testing.T) { if err != nil { t.Fatal(err) } - encKeyBytes, err := p7Data.DecryptAndVerify(recipient.Certificate, recipient.PrivateKey, func() error { + encKeyBytes, err := p7Data.DecryptAndVerify(recipient.Certificate, *recipient.PrivateKey, func() error { return p7Data.Verify() }) if err != nil { @@ -234,7 +234,7 @@ func TestCreateSignedEvnvelopedData(t *testing.T) { t.Fatal(err) } privKey := make([]byte, 32) - ecdsaKey, ok := (encryptKey.PrivateKey).(*ecdsa.PrivateKey) + ecdsaKey, ok := (*encryptKey.PrivateKey).(*ecdsa.PrivateKey) if !ok { t.Fatal("should be ecdsa private key") } @@ -247,7 +247,7 @@ func TestCreateSignedEvnvelopedData(t *testing.T) { t.Fatal(err) } saed.SetDigestAlgorithm(OIDDigestAlgorithmSHA256) - err = saed.AddSigner(rootCert.Certificate, rootCert.PrivateKey) + err = saed.AddSigner(rootCert.Certificate, *rootCert.PrivateKey) if err != nil { t.Fatal(err) } @@ -288,7 +288,7 @@ func TestCreateSignedEvnvelopedData(t *testing.T) { t.Errorf("Recipient issuer name does not match.\n\tExpected:%x\n\tActual:%x", recipient.Certificate.RawIssuer, recipients[0].RawIssuer) } - encKeyBytes, err := p7Data.DecryptAndVerify(recipient.Certificate, recipient.PrivateKey, func() error { + encKeyBytes, err := p7Data.DecryptAndVerify(recipient.Certificate, *recipient.PrivateKey, func() error { return p7Data.Verify() }) if err != nil { diff --git a/pkcs7/sign_test.go b/pkcs7/sign_test.go index 8cc132c..4f37079 100644 --- a/pkcs7/sign_test.go +++ b/pkcs7/sign_test.go @@ -51,7 +51,7 @@ func testSign(t *testing.T, isSM bool, content []byte, sigalgs []x509.SignatureA signerDigest, _ := getDigestOIDForSignatureAlgorithm(sigalgsigner) toBeSigned.SetDigestAlgorithm(signerDigest) - if err := toBeSigned.AddSignerChain(signerCert.Certificate, signerCert.PrivateKey, parents, SignerInfoConfig{}); err != nil { + if err := toBeSigned.AddSignerChain(signerCert.Certificate, *signerCert.PrivateKey, parents, SignerInfoConfig{}); err != nil { t.Fatalf("test %s/%s/%s: cannot add signer: %s", sigalgroot, sigalginter, sigalgsigner, err) } if testDetach { @@ -152,7 +152,7 @@ func TestUnmarshalSignedAttribute(t *testing.T) { } oidTest := asn1.ObjectIdentifier{2, 3, 4, 5, 6, 7} testValue := "TestValue" - if err := toBeSigned.AddSigner(cert.Certificate, cert.PrivateKey, SignerInfoConfig{ + if err := toBeSigned.AddSigner(cert.Certificate, *cert.PrivateKey, SignerInfoConfig{ ExtraSignedAttributes: []Attribute{{Type: oidTest, Value: testValue}}, }); err != nil { t.Fatalf("Cannot add signer: %s", err) @@ -190,7 +190,7 @@ func TestSkipCertificates(t *testing.T) { t.Fatalf("Cannot initialize signed data: %s", err) } - if err := toBeSigned.AddSigner(cert.Certificate, cert.PrivateKey, SignerInfoConfig{}); err != nil { + if err := toBeSigned.AddSigner(cert.Certificate, *cert.PrivateKey, SignerInfoConfig{}); err != nil { t.Fatalf("Cannot add signer: %s", err) } signed, err := toBeSigned.Finish() @@ -209,7 +209,7 @@ func TestSkipCertificates(t *testing.T) { if err != nil { t.Fatalf("Cannot initialize signed data: %s", err) } - if err := toBeSigned2.AddSigner(cert.Certificate, cert.PrivateKey, SignerInfoConfig{SkipCertificates: true}); err != nil { + if err := toBeSigned2.AddSigner(cert.Certificate, *cert.PrivateKey, SignerInfoConfig{SkipCertificates: true}); err != nil { t.Fatalf("Cannot add signer: %s", err) } signed, err = toBeSigned2.Finish() @@ -313,7 +313,7 @@ func TestSignWithoutAttr(t *testing.T) { if err != nil { t.Fatalf("Cannot initialize signed data: %s", err) } - if err := toBeSigned.SignWithoutAttr(cert.Certificate, cert.PrivateKey, SignerInfoConfig{SkipCertificates: sigalg.skipCert}); err != nil { + if err := toBeSigned.SignWithoutAttr(cert.Certificate, *cert.PrivateKey, SignerInfoConfig{SkipCertificates: sigalg.skipCert}); err != nil { t.Fatalf("Cannot add signer: %s", err) } signed, err := toBeSigned.Finish() diff --git a/pkcs7/verify_test.go b/pkcs7/verify_test.go index 20f5c92..44a3bad 100644 --- a/pkcs7/verify_test.go +++ b/pkcs7/verify_test.go @@ -527,7 +527,7 @@ but that's not what ships are built for. t.Fatal(err) } var derKey []byte - priv := signerCert.PrivateKey + priv := *signerCert.PrivateKey switch priv := priv.(type) { case *rsa.PrivateKey: derKey = x509.MarshalPKCS1PrivateKey(priv)