Skip to content

Add support for PSS padding when signing with RSA #8

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for PSS padding when signing with RSA #8

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
10 changes: 5 additions & 5 deletions swugenerator/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,16 @@ def parse_signing_option(
# Format : CMS,<private key>,<certificate used to sign>
else:
return SWUSignCMS(sign_parms[1], sign_parms[2], None, None)
if cmd == "RSA":
if cmd[:3] == "RSA":
if len(sign_parms) not in (2, 3) or not all(sign_parms):
raise InvalidSigningOption(
"RSA requires private key and an optional password file"
)
# Format : RSA,<private key>,<file with password>
# Format : RSA(PSS),<private key>,<file with password>
if len(sign_parms) == 3:
return SWUSignRSA(sign_parms[1], sign_parms[2])
# Format : RSA,<private key>
return SWUSignRSA(sign_parms[1], None)
return SWUSignRSA(sign_parms[1], sign_parms[2], pss=True if cmd == "RSAPSS" else False)
# Format : RSA(PSS),<private key>
return SWUSignRSA(sign_parms[1], None, pss=True if cmd == "RSAPSS" else False)
if cmd == "PKCS11":
# Format : PKCS11,<pin>
if len(sign_parms) != 2 or not all(sign_parms):
Expand Down
7 changes: 6 additions & 1 deletion swugenerator/swu_sign.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,21 @@ def prepare_cmd(self, sw_desc_in, sw_desc_sig):


class SWUSignRSA(SWUSign):
def __init__(self, key, passin):
def __init__(self, key, passin, pss=False):
super().__init__()
self.type = "RSA"
self.key = key
self.passin = passin
if pss == True:
self.pss_args = ["-sigopt rsa_padding_mode:pss", "-sigopt rsa_pss_saltlen:-2"]
else:
self.pss_args = []

def prepare_cmd(self, sw_desc_in, sw_desc_sig):
self.signcmd = (
["openssl", "dgst", "-sha256", "-sign", self.key]
+ self.get_passwd_file_args()
+ self.pss_args
+ ["-out", sw_desc_sig, sw_desc_in]
)

Expand Down