Freshgomod (#106)
* initial go modules, fresh start to find breaking change * change dep to go mod vendor * main go modules done, tests passed locally * upgrade go in dockerfileserver
This commit is contained in:
committed by
GitHub Enterprise
parent
a2940a4ba8
commit
678a62f152
92
vendor/software.sslmate.com/src/go-pkcs12/crypto.go
generated
vendored
92
vendor/software.sslmate.com/src/go-pkcs12/crypto.go
generated
vendored
@@ -7,18 +7,28 @@ package pkcs12
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/aes"
|
||||
"crypto/cipher"
|
||||
"crypto/des"
|
||||
"crypto/sha1"
|
||||
"crypto/sha256"
|
||||
"crypto/x509/pkix"
|
||||
"encoding/asn1"
|
||||
"errors"
|
||||
"hash"
|
||||
|
||||
"golang.org/x/crypto/pbkdf2"
|
||||
"software.sslmate.com/src/go-pkcs12/internal/rc2"
|
||||
)
|
||||
|
||||
var (
|
||||
oidPBEWithSHAAnd3KeyTripleDESCBC = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 12, 1, 3})
|
||||
oidPBEWithSHAAnd40BitRC2CBC = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 12, 1, 6})
|
||||
oidPBES2 = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 5, 13})
|
||||
oidPBKDF2 = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 5, 12})
|
||||
oidHmacWithSHA1 = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 2, 7})
|
||||
oidHmacWithSHA256 = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 2, 9})
|
||||
oidAES256CBC = asn1.ObjectIdentifier([]int{2, 16, 840, 1, 101, 3, 4, 1, 42})
|
||||
)
|
||||
|
||||
// pbeCipher is an abstraction of a PKCS#12 cipher.
|
||||
@@ -72,6 +82,17 @@ func pbeCipherFor(algorithm pkix.AlgorithmIdentifier, password []byte) (cipher.B
|
||||
cipherType = shaWithTripleDESCBC{}
|
||||
case algorithm.Algorithm.Equal(oidPBEWithSHAAnd40BitRC2CBC):
|
||||
cipherType = shaWith40BitRC2CBC{}
|
||||
case algorithm.Algorithm.Equal(oidPBES2):
|
||||
// rfc7292#appendix-B.1 (the original PKCS#12 PBE) requires passwords formatted as BMPStrings.
|
||||
// However, rfc8018#section-3 recommends that the password for PBES2 follow ASCII or UTF-8.
|
||||
// This is also what Windows expects.
|
||||
// Therefore, we convert the password to UTF-8.
|
||||
originalPassword, err := decodeBMPString(password)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
utf8Password := []byte(originalPassword)
|
||||
return pbes2CipherFor(algorithm, utf8Password)
|
||||
default:
|
||||
return nil, nil, NotImplementedError("algorithm " + algorithm.Algorithm.String() + " is not supported")
|
||||
}
|
||||
@@ -134,6 +155,77 @@ func pbDecrypt(info decryptable, password []byte) (decrypted []byte, err error)
|
||||
return
|
||||
}
|
||||
|
||||
// PBES2-params ::= SEQUENCE {
|
||||
// keyDerivationFunc AlgorithmIdentifier {{PBES2-KDFs}},
|
||||
// encryptionScheme AlgorithmIdentifier {{PBES2-Encs}}
|
||||
// }
|
||||
type pbes2Params struct {
|
||||
Kdf pkix.AlgorithmIdentifier
|
||||
EncryptionScheme pkix.AlgorithmIdentifier
|
||||
}
|
||||
|
||||
// PBKDF2-params ::= SEQUENCE {
|
||||
// salt CHOICE {
|
||||
// specified OCTET STRING,
|
||||
// otherSource AlgorithmIdentifier {{PBKDF2-SaltSources}}
|
||||
// },
|
||||
// iterationCount INTEGER (1..MAX),
|
||||
// keyLength INTEGER (1..MAX) OPTIONAL,
|
||||
// prf AlgorithmIdentifier {{PBKDF2-PRFs}} DEFAULT
|
||||
// algid-hmacWithSHA1
|
||||
// }
|
||||
type pbkdf2Params struct {
|
||||
Salt asn1.RawValue
|
||||
Iterations int
|
||||
KeyLength int `asn1:"optional"`
|
||||
Prf pkix.AlgorithmIdentifier
|
||||
}
|
||||
|
||||
func pbes2CipherFor(algorithm pkix.AlgorithmIdentifier, password []byte) (cipher.Block, []byte, error) {
|
||||
var params pbes2Params
|
||||
if err := unmarshal(algorithm.Parameters.FullBytes, ¶ms); err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
if !params.Kdf.Algorithm.Equal(oidPBKDF2) {
|
||||
return nil, nil, NotImplementedError("kdf algorithm " + params.Kdf.Algorithm.String() + " is not supported")
|
||||
}
|
||||
|
||||
var kdfParams pbkdf2Params
|
||||
if err := unmarshal(params.Kdf.Parameters.FullBytes, &kdfParams); err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if kdfParams.Salt.Tag != asn1.TagOctetString {
|
||||
return nil, nil, errors.New("pkcs12: only octet string salts are supported for pbkdf2")
|
||||
}
|
||||
|
||||
var prf func() hash.Hash
|
||||
switch {
|
||||
case kdfParams.Prf.Algorithm.Equal(oidHmacWithSHA256):
|
||||
prf = sha256.New
|
||||
case kdfParams.Prf.Algorithm.Equal(oidHmacWithSHA1):
|
||||
prf = sha1.New
|
||||
case kdfParams.Prf.Algorithm.Equal(asn1.ObjectIdentifier([]int{})):
|
||||
prf = sha1.New
|
||||
}
|
||||
|
||||
key := pbkdf2.Key(password, kdfParams.Salt.Bytes, kdfParams.Iterations, 32, prf)
|
||||
iv := params.EncryptionScheme.Parameters.Bytes
|
||||
|
||||
var block cipher.Block
|
||||
switch {
|
||||
case params.EncryptionScheme.Algorithm.Equal(oidAES256CBC):
|
||||
b, err := aes.NewCipher(key)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
block = b
|
||||
default:
|
||||
return nil, nil, NotImplementedError("pbes2 algorithm " + params.EncryptionScheme.Algorithm.String() + " is not supported")
|
||||
}
|
||||
return block, iv, nil
|
||||
}
|
||||
|
||||
// decryptable abstracts an object that contains ciphertext.
|
||||
type decryptable interface {
|
||||
Algorithm() pkix.AlgorithmIdentifier
|
||||
|
||||
Reference in New Issue
Block a user