Merge many outstanding PRs, add a bunch of type signatures, improve code quality - #450

Open

dkg wants to merge 151 commits into

SecurityInnovation:masterfrom

dkg:dkg/overhaul

Commits on Nov 24, 2022

Remove unneeded inheritance on `object`
KOLANICH
committed
cbd2fa1
Replaced old-style `super` with the modern one.
KOLANICH
committed
1497a55
Modernized yields into `yield from`
KOLANICH
committed
1aafeb8
Modernized collections to literal comprehensions syntax
KOLANICH
committed
f66009e
Got rid of Unicode literals
KOLANICH
committed
d342d3f
Removed unneeded traced of Python 2 related to division
KOLANICH
committed
2b409f4

Commits on Jan 18, 2023

define more subpacket features
janmojzis
committed
9e3110d

Commits on May 3, 2023

Drop unneccessary duplicate string registrations
dkg
committed
2a37a53

Commits on May 26, 2023

remove more `six` references
ktdreyer
committed
609cb8a

Commits on Jun 13, 2023

Tests: Check on forward-compatibility failures
dkg
committed
a3941e0

Commits on Jun 14, 2023

Drop unused test_load_ask_bench.py
dkg
committed
fb4bea1
tests: Avoid passing naive datetime objects
dkg
committed
d5155d2
Avoid looking for encrypted messages with "Plaintext" encoding
dkg
committed
17cb140

Commits on Jun 15, 2023

rename setter for EmbeddedSignature._sig (otherwise definition was aliased)
dkg
committed
8e4f7ca
Drop erroneous SubkeyBindingSignature
dkg
committed
0f8c67d

Commits on Jun 16, 2023

handle Armored text with UTF-8 comments
dkg
committed
edd7e4f
initial PGPy-backed implementation of sop
dkg
committed
26e6c37
sop.py: allow instances to augment the interface; provide autocomplete
dkg
committed
8dabb3a
treat keyflags as a set, as expected
dkg
committed
1d5e06e
use specialized exception for missing options
dkg
committed
814a65e
sopgpy: add armor and dearmor subcommands
dkg
committed
adbd3bd
indicate each unsupported feature separately for cleaner diffs
dkg
committed
820a9fc
sopgpy: added --sessionkey to encrypt subcommand
dkg
committed
19c7f7e
cleanup and overhaul python sop.py framework
dkg
committed
699f4b0
clean up signature result printing
dkg
committed
dad83bc
sopgpy: do not try to encrypt with IDEA
dkg
committed
48f2cc1
sop decrypt: handle session key and verification output cleanly
dkg
committed
0a64e50
Enable easier extension to the sop interface
dkg
committed
95b635a
sopgpy: Improve shebang so that we can use virtualenv.

teythoon
authored and
dkg
committed
d5aaa90
sopgpy: move to 0.2.0 of python-sop
dkg
committed
6a5f4cd
PGPy removed __version__ in 0.5.4. This fix relies on python ≥ 3.8
dkg
committed
b2b861c
sopgpy: encrypt --sign-with
dkg
committed
e0b6b9a
sopgpy decrypt: handle --verify-with
dkg
committed
0fbb2aa
sopgpy encrypt: implement --with-password
dkg
committed
65fe736
sopgpy decrypt: implement --with-password
dkg
committed
03c9eae
sopgpy sign: Raise the correct error when trying to sign non-UTF-8 text as text
dkg
committed
a1fd82f
reported multiple signature problem to PGPy
dkg
committed
60a046e
sopgpy encrypt: respect --as= argument
dkg
committed
e136dd7
Avoid passing a bytes object as a passphrase to pgpy ≤ 0.5.4
dkg
committed
99b839b
Bump sopgpy version to 0.2.0
dkg
committed
a6eb7db
sopgpy: move _multisig bogus object to its own definition
dkg
committed
b5d9886
sopgpy: drop sop armor's --allow-nested option (deprecated in the spec)
dkg
committed
112f8f5
sopgpy: fix decrypt warnings when symmetric decryption fails
dkg
committed
40aa017
sopgpy: clean up _maybe_armor type definitions
dkg
committed
6da28fc
sopgpy: clean up tz-naive objects if pgpy emits them (it shouldn't)
dkg
committed
a727188
sopgpy: create wrapper that permits a closure to do operations with a locked secret key
dkg
committed
28fc92f
sopgpy: add sop sign --micalg-out
dkg
committed
6678af8
sopgpy: announce backend distinctly from version of sopgpy
dkg
committed
6210476
sopgpy: add sop generate-key --with-key-password
dkg
committed
faf8f4e
sopgpy: add --with-key-password to decrypt, sign, and encrypt (when signing)
dkg
committed
14d94b7
sopgpy: add inline-{detach,sign,verify}
dkg
committed
323b48f
sopgpy: bump to version 0.3.0 (depends on sop 0.4.0)
dkg
committed
b7c3192
sopgpy generate-key: improve key password
dkg
committed
114321b
sopgpy: move to PGPy 0.6.0 (sigsubj changes)
dkg
committed
8272870
sopgpy: move to PGPy 0.6.0 (from_blob() behavior changes)
dkg
committed
34a35b8
sopgpy: change license to match PGPy license. I am the sole author so far.
dkg
committed
be04b27
sopgpy: use the PGPy version directly, rather than a distinct sopgpy version
dkg
committed
70601fc
sopgpy version --extended: add version info about cryptography module and OpenSSL
dkg
committed
a2a0621
intentionally distribute sopgpy as part of the module
dkg
committed
02bd731
sopgpy: drop trailing whitespace
dkg
committed
4127e47
sopgpy: return ArgumentParser for argparse-manpage
dkg
committed
c3090f9
sopgpy: lowercase name to match the command-line name
dkg
committed
8d071c8
use keyword-based arguments when creating SOPSigResult
dkg
committed
d21c5de
OPSv3: get the "nested" flag right
dkg
committed
773f39b
Add PGPSignatures object, representing bundled detached signatures
dkg
committed
e0c2ba8
sopgpy: clean up type annotations
dkg
committed
f087339
sopgpy: use sop 0.5.1 (support profiles)
dkg
committed
37a741b
sopgpy generate-key: Add "rfc4880" profile, for 3072-bit RSA keys
dkg
committed
cbe16c5
PEP-8 whitespace cleanup
dkg
committed
0aa4d68
Add PubKeyAlgorithm.Unknown
dkg
committed
a01c66c
Handle signatures that use an unknown public key algorithm
dkg
committed
d38c069

Commits on Jun 28, 2023

Handle subkeys with unknown public key algorithms cleanly
dkg
committed
0e298a9
Add PGPSignatures object, representing bundled detached signatures
dkg
committed
692eafd
use PGPSignatures to handle multi-sig detached signatures
dkg
committed
d9e1941
PGPMessage: ignore opaque packets when assembling
dkg
committed
eb9310a
PKESKv3: correct packet length consumption when pubkey algorithm is unknown
dkg
committed
9d26b2e
PKESKv3: handle unknown pubkey algorithms cleanly
dkg
committed
cdb6347
String2KeyType: introduce "Unknown" option, and note opaque values when discovered
dkg
committed
6d78d1b
Drop the use of pyasn1 for DSA/ECDSA signature translation
dkg
committed
feb4506
Overhaul EllipticCurveOID (reduce dependencies)
dkg
committed
23ea160
HashAlgorithm: treat Unknown explicitly, like PubKeyAlgorithm
dkg
committed
a1b1947
When a curve is unknown, treat the EC point as an opaque MPI
dkg
committed
522df3c
PEP-8: whitespace tuneup
dkg
committed
cee0467
Avoid spurious CryptographyDeprecationWarning
dkg
committed
ba04c11
Fix test: ensure that deprecation warnings don't interfere with test suite
dkg
committed
fb885e6
drop use of imghdr
dkg
committed
221a1f1
Merge branches 'dont-encrypt-plaintext', 'avoid-naive-datetime', 'cryptography-deprecations', 'drop-unused-test', 'drop-imghdr', 'cleanup-registrations', 'fix-aliased-function', 'drop-mistaken-sbs'…
dkg
committed
3227a57
Merge branch 'compat-tests' into dkg/overhaul
dkg
committed
3150ef4
Merge branch 'sop' into dkg/overhaul
dkg
committed
98b69c2

Commits on Jul 11, 2023

PGPKey.from_file,from_blob: Drop failed filtering of keyid mapping
dkg
committed
efa2fed

Commits on Jul 13, 2023

Merge branch 'cleanup-keylist' into dkg/overhaul
dkg
committed
d2dda7d
python cleanup: collections.abc was split out in python 3.3
dkg
committed
fd128d6
drop __nonzero__ -- 3.x uses __bool__
dkg
committed
55c2ad4
drop double export of fingerprint
dkg
committed
0863a7b
use functools.singledispatch instead of singledispatch
dkg
committed
604772d
add an explicit "return None" when selfsig has nothing
dkg
committed
bdcf97e
Rename _encrypt and _decrypt to _cfb_encrypt and _cfb_decrypt
dkg
committed
0fc8fd0
PGPKey.encrypt: enumerate optional arguments and type signatures
dkg
committed
98718cd
Add a handful of type signatures
dkg
committed
cb2e080
SKESK: clarify type signatures for encrypt_sk and decrypt_sk
dkg
committed
1f158e8
Add type signatures for PKESK.encrypt_sk and PKESK.decrypt_sk
dkg
committed
34ee5d0
PKESK: make dynamic arguments lists instead of tuples
dkg
committed
b1c0e6e
PGPUID: make regex-matcher more comprehensible to typechecker
dkg
committed
ef038aa
Note that __ver__ of a packet is either int or None (unversioned)
dkg
committed
6565828
packets.PubKey.fingerprint: property is of type Fingerprint
dkg
committed
996c00e
pgpy/types.py: clean up mypy warnings
dkg
committed
2b906eb
declare FlagList and ByteFlag types as None or some type
dkg
committed
6c372b3
Tell the typechecker that MPIs, PrivKey, and PubKey can all use variable-length Tuples
dkg
committed
0d1339d
Use the standard name for a namedtuple to satisfy the typechecker
dkg
committed
de8b582
PGPSignature: document non-controversial type signatures
dkg
committed
ef04603
Add more simple type annotations
dkg
committed
2df15a0
_cfb_encrypt, _cfb_decrypt: add type signatures
dkg
committed
77c89ea
SorteDeque: add type annotations
dkg
committed
ef0cb79
Add enumerated types for Signature and Attribute subpackets
dkg
committed
7c63a6c
PEP-8 cleanup (mostly whitespace fiddling)
dkg
committed
bbac9e8
Armorable.ascii_unarmor: clean up type signatures
dkg
committed
56a3dbb
Packet() constructor is safe due to MetaDispatchable, despite Packet itself being abstrct
dkg
committed
b93a2b7
clean up type checking for CipherTexts
dkg
committed
9002f31
Clean up type checking for Signatures
dkg
committed
ea28e87
clean up type checking for Key material fields
dkg
committed
cb6a764
Test attempts to use EdDSA with anything but Ed25519
dkg
committed
b72e316
Ensure that IssuerFingerprint subpacket contains None or Fingerprint
dkg
committed
2f06397
clarify when a key must have a UID
dkg
committed
62eee3e
drop Backend enum and corresponding default_backend() calls
dkg
committed
0d6ec16
drop HashAlgorithm.tuned_count (not necessary, we just max out S2K)
dkg
committed
b4e87f3
Add named S2KUsage enum, in alignment with the new registry in crypto-refresh
dkg
committed
d7acaeb
HashAlgorithm.digest() -- one-off hash from the cryptography module
dkg
committed
8b326f2
Fingerprint: learn its version explicitly
dkg
committed
88784cb
Drop all use of hashlib
dkg
committed
cdc4799
Move make_onepass to Signature packets
dkg
committed
1cd7a38
String2Key: improve type signatures
dkg
committed
878bc48
Each public key implementation should know what "pubkey algo" it uses
dkg
committed
6e225cd
Overhaul dispatch mechanism to use Enums instead of ints
dkg
committed
0bd8c1a
Drop check for __typeid__.__abstractmethod__
dkg
committed
86aa055
Consolidate fingerprint-bearing subpackets
dkg
committed
64630b4
place KeyFlags ("usage") subpacket in order with other subpackets
dkg
committed
e3691ae
Allow the user to explicitly set `features` flags
dkg
committed
72b77fe
Ensure feature flags can be placed on Direct Key signatures
dkg
committed
1fe2a14
When adding a subpacket to the hashed region, remove it from unhashed
dkg
committed
a2c1317
Create normalized signatures by sorting subpackets by type ID
dkg
committed
ff345c1
string representation of subpacket should report when it is critical
dkg
committed
3efde16
Make it possible to add a critical subpacket
dkg
committed
717d240
Make CreationTime and KeyFlags subpackets critical by default
dkg
committed
fb318ab
when algorithm IDs don't need MPIs, enable a different way to emit them.
dkg
committed
bb17b59
PGPKey.userids always returns a list of PGPUIDs
dkg
committed
7b83b7e
constants.py: add type annotations
dkg
committed
5755e6d
PrivKey._generate should make reasonable choices if params are None
dkg
committed
43db15b
Deprecate short ID
dkg
committed
5ed3fc4
String2Key: auto-generate salt
dkg
committed
dad51bb
Correct tests for String2Key
dkg
committed
7204a64
String2Key: auto-populate iv
dkg
committed
4c364ab