Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for RSA-OAEP-384 and RSA-OAEP-512 #1142

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Add support for RSA-OAEP-384 and RSA-OAEP-512 #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/jwxtest/jwxtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func EncryptJweFile(ctx context.Context, payload []byte, keyalg jwa.KeyEncryptio
var keyif interface{}

switch keyalg {
case jwa.RSA1_5, jwa.RSA_OAEP, jwa.RSA_OAEP_256:
case jwa.RSA1_5, jwa.RSA_OAEP, jwa.RSA_OAEP_256, jwa.RSA_OAEP_384, jwa.RSA_OAEP_512:
var rawkey rsa.PrivateKey
if err := key.Raw(&rawkey); err != nil {
return "", nil, fmt.Errorf(`failed to obtain raw key: %w`, err)
Expand Down
4 changes: 4 additions & 0 deletions jwa/key_encryption_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 80 additions & 0 deletions jwa/key_encryption_gen_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jwe/decrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func (d *decrypter) BuildKeyDecrypter() (keyenc.Decrypter, error) {
}

return keyenc.NewRSAPKCS15Decrypt(alg, &privkey, cipher.KeySize()/2), nil
case jwa.RSA_OAEP, jwa.RSA_OAEP_256:
case jwa.RSA_OAEP, jwa.RSA_OAEP_256, jwa.RSA_OAEP_384, jwa.RSA_OAEP_512:
var privkey rsa.PrivateKey
if err := keyconv.RSAPrivateKey(&privkey, d.privkey); err != nil {
return nil, fmt.Errorf(`*rsa.PrivateKey is required as the key to build %s key decrypter: %w`, alg, err)
Expand Down
16 changes: 12 additions & 4 deletions jwe/internal/keyenc/keyenc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
// NewRSAOAEPEncrypt creates a new key encrypter using RSA OAEP
func NewRSAOAEPEncrypt(alg jwa.KeyEncryptionAlgorithm, pubkey *rsa.PublicKey) (*RSAOAEPEncrypt, error) {
switch alg {
case jwa.RSA_OAEP, jwa.RSA_OAEP_256:
case jwa.RSA_OAEP, jwa.RSA_OAEP_256, jwa.RSA_OAEP_384, jwa.RSA_OAEP_512:
default:
return nil, fmt.Errorf("invalid RSA OAEP encrypt algorithm (%s)", alg)
}
Expand Down Expand Up @@ -462,8 +462,12 @@
hash = sha1.New()
case jwa.RSA_OAEP_256:
hash = sha256.New()
case jwa.RSA_OAEP_384:
hash = sha512.New384()
case jwa.RSA_OAEP_512:
hash = sha512.New()

Check warning on line 468 in jwe/internal/keyenc/keyenc.go

View check run for this annotation

Codecov / codecov/patch

jwe/internal/keyenc/keyenc.go#L465-L468 

Added lines #L465 - L468 were not covered by tests
default:
return nil, fmt.Errorf(`failed to generate key encrypter for RSA-OAEP: RSA_OAEP/RSA_OAEP_256 required`)
return nil, fmt.Errorf(`failed to generate key encrypter for RSA-OAEP: RSA_OAEP/RSA_OAEP_256/RSA_OAEP_384/RSA_OAEP_512 required`)

Check warning on line 470 in jwe/internal/keyenc/keyenc.go

View check run for this annotation

Codecov / codecov/patch

jwe/internal/keyenc/keyenc.go#L470 

Added line #L470 was not covered by tests
}
encrypted, err := rsa.EncryptOAEP(hash, rand.Reader, e.pubkey, cek, []byte{})
if err != nil {
Expand Down Expand Up @@ -536,7 +540,7 @@
// NewRSAOAEPDecrypt creates a new key decrypter using RSA OAEP
func NewRSAOAEPDecrypt(alg jwa.KeyEncryptionAlgorithm, privkey *rsa.PrivateKey) (*RSAOAEPDecrypt, error) {
switch alg {
case jwa.RSA_OAEP, jwa.RSA_OAEP_256:
case jwa.RSA_OAEP, jwa.RSA_OAEP_256, jwa.RSA_OAEP_384, jwa.RSA_OAEP_512:
default:
return nil, fmt.Errorf("invalid RSA OAEP decrypt algorithm (%s)", alg)
}
Expand All @@ -560,8 +564,12 @@
hash = sha1.New()
case jwa.RSA_OAEP_256:
hash = sha256.New()
case jwa.RSA_OAEP_384:
hash = sha512.New384()
case jwa.RSA_OAEP_512:
hash = sha512.New()

Check warning on line 570 in jwe/internal/keyenc/keyenc.go

View check run for this annotation

Codecov / codecov/patch

jwe/internal/keyenc/keyenc.go#L567-L570 

Added lines #L567 - L570 were not covered by tests
default:
return nil, fmt.Errorf(`failed to generate key encrypter for RSA-OAEP: RSA_OAEP/RSA_OAEP_256 required`)
return nil, fmt.Errorf(`failed to generate key encrypter for RSA-OAEP: RSA_OAEP/RSA_OAEP_256/RSA_OAEP_384/RSA_OAEP_512 required`)

Check warning on line 572 in jwe/internal/keyenc/keyenc.go

View check run for this annotation

Codecov / codecov/patch

jwe/internal/keyenc/keyenc.go#L572 

Added line #L572 was not covered by tests
}
return rsa.DecryptOAEP(hash, rand.Reader, d.privkey, enckey, []byte{})
}
Expand Down
2 changes: 1 addition & 1 deletion jwe/jwe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (b *recipientBuilder) Build(cek []byte, calg jwa.ContentEncryptionAlgorithm
return nil, nil, fmt.Errorf(`failed to create RSA PKCS encrypter: %w`, err)
}
enc = v
case jwa.RSA_OAEP, jwa.RSA_OAEP_256:
case jwa.RSA_OAEP, jwa.RSA_OAEP_256, jwa.RSA_OAEP_384, jwa.RSA_OAEP_512:
var pubkey rsa.PublicKey
if err := keyconv.RSAPublicKey(&pubkey, rawKey); err != nil {
return nil, nil, fmt.Errorf(`failed to generate public key from key (%T): %w`, rawKey, err)
Expand Down
4 changes: 2 additions & 2 deletions jwx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func TestJoseCompatibility(t *testing.T) {

var tests []interopTest

for _, keyenc := range []jwa.KeyEncryptionAlgorithm{jwa.RSA1_5, jwa.RSA_OAEP, jwa.RSA_OAEP_256} {
for _, keyenc := range []jwa.KeyEncryptionAlgorithm{jwa.RSA1_5, jwa.RSA_OAEP, jwa.RSA_OAEP_256, jwa.RSA_OAEP_384, jwa.RSA_OAEP_512} {
if !set.Has(keyenc.String()) {
t.Logf("jose does not support key encryption algorithm %q: skipping", keyenc)
continue
Expand Down Expand Up @@ -297,7 +297,7 @@ func joseInteropTest(ctx context.Context, spec interopTest, t *testing.T) {

t.Run("Parse JWK via jwx", func(t *testing.T) {
switch spec.alg {
case jwa.RSA1_5, jwa.RSA_OAEP, jwa.RSA_OAEP_256:
case jwa.RSA1_5, jwa.RSA_OAEP, jwa.RSA_OAEP_256, jwa.RSA_OAEP_384, jwa.RSA_OAEP_512:
var rawkey rsa.PrivateKey
if !assert.NoError(t, jwxJwk.Raw(&rawkey), `jwk.Raw should succeed`) {
return
Expand Down
10 changes: 10 additions & 0 deletions tools/cmd/genjwa/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,16 @@ func _main() error {
value: "RSA-OAEP-256",
comment: `RSA-OAEP-SHA256`,
},
{
name: `RSA_OAEP_384`,
value: "RSA-OAEP-384",
comment: `RSA-OAEP-SHA384`,
},
{
name: `RSA_OAEP_512`,
value: "RSA-OAEP-512",
comment: `RSA-OAEP-SHA512`,
},
{
name: `A128KW`,
value: "A128KW",
Expand Down
Loading