Up to [cvs.NetBSD.org] / src / crypto / external / bsd / netpgp / dist / src / lib
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
netpgp: fix build with Clang (since 2022-10-01) error: passing 'char [1]' to parameter of type 'const uint8_t *' (aka 'const unsigned char *') converts between pointers to integer types where one is of the unique plain 'char' type and the other is not [-Werror,-Wpointer-sign]
netpgpkeys: properly terminate string before calling strdup $ MALLOC_CONF=junk:true netpgpkeys \ --export-key \ --keyring=/usr/pkg/etc/gnupg/pkgsrc.gpg \ b5952cabdd765a20 The above command printed "-----END PGP PUBLIC KEY BLOCK-----\r\n" followed by "\xA5\xA5\xA5...".
netpgp: fix or suppress a few lint warnings No functional change.
allow netpgp to absorb gpg2 subpkt 33 for list/enc/decrypt rsa keys
Sync with HEAD
Sync with HEAD, resolve a couple of conflicts
Fix some error handling, json support, keyring handling.
Sync with HEAD
Sync with HEAD
Do not ask for a passphrase when empty Submitted on tech-pkg@ as: [PATCH 06/11] Do not ask for a passphrase when empty Only modified for consistency with the coding style.
Expect a FILE * for pgp_decrypt_seckey() Submitted on tech-pkg@ as: [PATCH 05/11] Expect a FILE * for pgp_decrypt_seckey() No functional change intended.
Do not use random data for pass-phrases on EOF Submitted on tech-pkg@ as: [PATCH 04/11] Do not use random data for pass-phrases on EOF Only modified for consistency with the coding style.
Avoid some type casts Submitted on tech-pkg@ as: [PATCH 03/11] Avoid some type casts No functional change intended.
Sync with HEAD
Do not crash when listing keys without a keyring To test: (with an empty ~/.gnupg) $ netpgpkeys --import-key /dev/null Submitted on tech-pkg@ as: [PATCH 01/11] Do not crash when listing keys without a keyring Different patch for the same issue.
change mj library to take an additional argument for a string type, denoting its length. this allows binary strings to be encoded using libmj. escape magic characters in json strings in a more efficient manner. the previous method was not scalable. update callers to suit bump libmj major version number add examples to the libmj(3) man page
Don't prefix function names with "pgp_" if the functions are static.
Take the internal functions and definitions back out of the implementation namespace: :g/\<__ops/s//pgp/g :g/\<__OPS/s//__PGP/g :g/\<OPS/s//PGP/g No functional change, regression tests complete successfully.
PR/42435 : Check pointers against NULL to avoid dereferencing them
Various minor changes to netpgp: + be smarter when checking for a null id + add test for rubbish being returned when listing specific keys in netpgpkeys(1) + take the public key from the pubring, not the secring when exporting keys + allow hkpd to serve ssh keys in pgp format + test on whether a seckey is needed, not on a userid needed, for ssh keys
Denote the signing key with the word "signature" (the encryption key already has the tag "encryption"). This is a bit more meaningful than "pub" and "sub".
avoid false positives when matching a (non-existent) encryption subkey use debugging output to point to the matching key
fix some more amd64 lint
+ rationalise birthtime/expiration timestamps into a single function + clean up some 64-bit (amd64) lint
Changes to 3.99.9/20100809 + add single character options to netpgp(1) and netpgpkeys(1) + add -o long-option(=value)? options to netpgp(1) and netpgpkeys(1) + add some small preparations for using the first subkey for encryption (much more to follow)
Catch up the JSON routines being in their own library. Use the JSON routines to return all the text as a JSON-encoded string for all keys and sigs which are returned.
Changes to 3.99.7/20100701 + recognise ascii-armoured encrypted messages properly, in memory and in files + print error message and exit for now when trying to encrypt with a DSA key + fix bug reported by dyoung when trying to print out the encryption key fingerprint
Changes to 3.99.5 + make ssh fingerprints (md5) match netpgp listing + use the more functional hexdump function from ssh2pgp in place of the older hexdump function from openpgpsdk + pass hash type down from command line where needed + add test for netpgp/ssh key fingerprint matching + make netpgpkeys(1) take a --hash= option With these changes, netpgp can be made to generate the same fingerprint as openssh (by default, ssh-keygen(1) uses an md5 digest) % /usr/bin/netpgpkeys --ssh-keys --sshkeyfile=/etc/ssh/ssh_host_rsa_key.pub --list-keys --hash=md5 1 key pub 1024/RSA (Encrypt or Sign) fcdd1c608bef4c4b 2008-08-11 Key fingerprint: e935 902d ebf1 76ba fcdd 1c60 8bef 4c4b uid osx-vm1.crowthorne.alistaircrooks.co.uk (/etc/ssh/ssh_host_rsa_key.pub) <root@osx-vm1.crowthorne.alistaircrooks.co.uk> % ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub 1024 e9:35:90:2d:eb:f1:76:ba:fc:dd:1c:60:8b:ef:4c:4b /etc/ssh/ssh_host_rsa_key.pub (RSA) %
Simplify and shorten the internals of packet processing by getting rid of the intermediate pseudo-abstraction layer, which detracted from understanding and had no benefit whatsoever. Rename some enums and some definitions.
correct indentation - no functional change
use hexdump() where possible. get rid of all traces of dmalloc - it's not used anymore. we can now g/c initialisation functions which do not do anything. also get rid of the pkeyid() functions, which just prints a hexadecimal string
use a better name for a key in a function - no functional change
Changes to 2.99.1/20100313 + add functionality to parse basic signature subkeys + in doing so, add expiration of keys + at the same time, add revocation of keys + recognise the primary user id, and use it when displaying user ids + recognise self signed keys and subkeys + rework the indentation of output + add the --list-sigs [userid] option to netpgpkeys(1) + use memcmp(3) rather than strcmp(3) when checking binary user ids to be exported + add expiration display to subkey signature output + update libnetpgp library version major number to 3
make sure that the expiration date and time are attached to the correct key
ensure that we have an element in the array before we try to store a value in it.
Changes to 1.99.22/20100307 + add key expiry information to public key information display
clean up some lint that crept in.
Update netpgp to version 1.99.20/20100304 - portability improvements, and bug fixes: Changes to 1.99.20/20100304 + move args to some functions around to be consistent + use uint*_t where appropriate + fix bug in verify memory + add documentation to manual pages to show how to do combined signing/encryption and decryption/verification + make verification of ascii-armoured memory work the same as binary + eliminate use of strdup(3), strcasecmp(3), and strptime(3). NetBSD/pkgsrc PR 42922 applies - need to define _XOPEN_SOURCE and _BSD_SOURCE for newer linux platforms with glibc 2.10.1. solved a bit differently, by implementing strdup(3) and strcasecmp(3) independently, and using regexps to avoid calling strptime(3).
Changes to 1.99.16/20100205 + minor simplifications to netpgp(1) internally + fix a bug in netpgp_verify_file where a non-existent file while listing packets would cause a SIGSEGV + add duration arg to netpgp(1), and check for validity when verifying signatures + add birthtime arg to netpgp(1), and check for validity when verifying signatures + add netpgp commands to print pubkey, if desired + allow the passphrase for the signature to be taken from --pass-fd + get rid of static indent value when printing packet contents + print signature validity times when verifying a file's signature
Prepare for a new netpgp-20091210 portable release. Apart from infrastructure changes, there are the following functional ones: + Update to version 20091210 + provide a new netpgp_match_list_keys(3) function to perform a regular-expression based search of all the keys in the keyring. If no pattern is specified to match, then all keys are returned. + provide a new netpgp_set_homedir(3) function, and use it to set the home directory from the library, rather than individually in all the programs which use the library + provide a new netpgp_incvar(3) function which will add a constant increment (which may be negative) to the value of an internal variable. This is primarily used for the verbosity level within the library, and is again a movement of the function into the library from the individual programs which use the library + move to the specification of an ssh key file by internal variable, rather than the directory holding an ssh key file + autoconf infrastructure changes + take a hammer to the _GNU_SOURCE definitions problems + don't rely on strnlen(3) being present everywhere
size_t %z police
+ When using ssh keys, use the first key as the default userid, unless specified. + The internal variable "sshetcdir" has been renamed to "sshkeydir" + When matching the text fields in the username, use an ICASE, NOSUB, EXTENDED regular expression. This allows more advanced ways of searching, such as: % netpgpkeys --list-keys '\.de\>' to find all the keys in the default keyring which have an email address in Germany. This is actually surprisingly useful.
Add the ability to use ssh host keys (on the fly) to provide RSA keys. These keys can be used in the same way as normal PGP keys - to sign, verify, encrypt and decrypt files and data. % cp configure a % sudo netpgp --ssh-keys --sign --userid 1e00404a a Password: pub 1024/RSA (Encrypt or Sign) 040180871e00404a 2008-08-11 Key fingerprint: c4aa b385 4796 e6ce 606c f0c2 0401 8087 1e00 404a % sudo chmod 644 a.gpg % netpgp --ssh-keys --verify a.gpg netpgp: default key set to "C0596823" can't open '/etc/ssh/ssh_host_rsa_key' Good signature for a.gpg made Fri Dec 4 23:04:36 2009 using RSA (Encrypt or Sign) key 040180871e00404a pub 1024/RSA (Encrypt or Sign) 040180871e00404a 2008-08-11 Key fingerprint: c4aa b385 4796 e6ce 606c f0c2 0401 8087 1e00 404a uid osx-vm1.crowthorne.alistaircrooks.co.uk (/etc/ssh/ssh_host_rsa_key.pub) <root@osx-vm1.crowthorne.alistaircrooks.co.uk> % uname -a NetBSD osx-vm1.crowthorne.alistaircrooks.co.uk 5.99.20 NetBSD 5.99.20 (ISCSI) #0: Wed Oct 7 17:16:33 PDT 2009 agc@osx-vm1.crowthorne.alistaircrooks.co.uk:/usr/obj/i386/usr/src/sys/arch/i386/compile/ISCSI i386 % The ssh host keys do not need to be manipulated in any way - the information is read from existing files.
More checks for the return value from memory allocation.
More Flexelint fixes from phk - just low-hanging fruit for just now - many thanks!
+ only prompt for the passphrase for the secret key if the secret key is protected by a passphrase
CHANGES 1.99.10 -> 1.99.11 + address keys array from 0 with unsigned indices + print results to io->res stream - default to stderr, and set using netpgp_setvar(..., "results", filename) + __ops_keyid()'s third arg was always the size of the keyid array - no need to pass it + get rid of the excessive type-checking in packet-show-cast.h, which wasn't necessary, and fold all the show routines into packet-show.c + introduce a generic __ops_new() and use it for some structure allocation
Get rid of an unusual architectural construct: The original code had dynamic arrays indexed by unsigned indices, except for the array of keys, which was indexed by a signed integer, and initialised to -1. Subsequently, when a new id was created, the index was pre-incremented, and later on, in a different call, the userid (a different packet) was assigned to the current index. This has implications for growing the array, for signed comparison checks, and just general cleanliness. This change overhauls the construct: don't special case anything, just address the array from 0, use unsigned indices same as everything else, and complain if we get a user id for which we haven't received a public or secret key.
CHANGES 1.99.9 -> 1.99.10 + fix a bug in decryption whereby a bad passphrase would cause a segmentation violation + fix some regressions in key searching in the underlying find keys routines + add C++ declaration protection to the external interface in netpgp.h + split out the key management parts of netpgp(1) into netpgpkeys(1)
CHANGES 1.99.8 -> 1.99.9 + make more use of __ops_io_t structure + addition of standalone, stripped-down netpgpverify utility + addition of test for --list-packets on an empty file + bring forward some simplifications from netpgpverify + some name changes + get rid of the increment and then decrement keycount around accumulated data ("it's to do with counting") + then use unsigned integers for the size and counts for the dynamic array of keys, and use the common dynamic array macros for keys in a keyring + if it's a union, let's use it as a union, not a struct + modified documentation to correct the --list-packets command (sorry, ver) + add a new directory structure for both the distribution and the reachover Makefiles. The autotest framework has been partially overhauled but more TLC is needed here. + add a --pass-fd=n option so that external programs can provide the passphrase on a file descriptor without going through the callback, requested by joerg
CHANGES 1.99.7 -> 1.99.8 + get rid of __ops_malloc_passphrase() - strdup() works just as well + generalise __ops_seckey_forget() to become __ops_forget(), give it a size parameter, and make it work on things other than secret keys (passphrases for instance) + minor struct field enum renaming + minor function call renaming + add ops_io_t struct to hold pointers to IO streams, and pass it down where necessary
CHANGES 1.99.6 -> 1.99.7 + added to the regression tests + get rid of some magic constants, replace with more obvious names + zero out the memory used for a passphrase before freeing it in one place
CHANGES 1.99.4 -> 1.99.5 + Luke Mewburn completely overhauled the auto tools infrastructure + changed signature (hah!) of some netpgp file management prototypes to use const char * for file names and user ids, not char * - suggested by christos + change some of the openpgpsdk display functions to return integer values, and send those values back from the netpgp functions - suggested by christos + rather than passing a shedload of variables to netpgp_init(), get rid of them, and set variables using the netpgp_[gs]etvar() interface + replace some magic constants with descriptive names + use a netpgp variable to skip userid checks if necessary + add ability to allow coredumps via --coredumps if (a) you have taken leave of your sanity, and (b) you have some magical persistent storage which doesn't spare sectors, and (c) you know how to remove a file securely + bumped library version on NetBSD to 1.0 for interface changes
CHANGES 1.99.3 -> 1.99.4 + get rid of some magic constants + revamped regression test script to count number of tests passed + made checkhash array in ops_seckey_t dynamic, rather than statically allocated + made mdc array dynamic, and added a length field to mdc for future use + revamped usage message to match reality + made portable version again for the autoconfed package sources + add separate netpgpdigest.h file so that separate digest sizes can be used without having to include "packet.h" in everything
CHANGES 1.99.1 -> 1.99.2 + various minor cleanups + fix longstanding pasto where the key server preference packets are displayed with the correct ptag information + up until now, there has been an asymmetry in the command line options for netpgp(1) - whilst a file may have signature information added to it with the "--sign" command, there has been no way to retrieve the contents of the file without the signature. The new "--cat" option does this (there are synonyms of "--verify-show" and "--verify-cat") - the signature is verified, and if it matches, the original contents of the file are sent to the output file (which defaults to stdout, and can be set with the --output option on the command line). If the signature does not match, there is no output, and an EXIT_FAILURE code is returned. + revamped netpgp(1) to make it clear what commands are available, how these commands relate to each other, and which commands take custom options
CHANGES 1.0.0 -> 1.99.1 + released and tagged version 1.0.0; development version now 1.99.1 + get rid of some fields which are no longer needed + minor name changes + add mmapped field to ops_data_t struct to denote that the array needs an munmap(2) and not a free(3) + add an __ops_mem_readfile() function, and use it for reading files. The function does mmap(2), and then falls back to read(2) if that fails. Retire unused __ops_fileread() which had an unusual interface + drop sign_detached() from netpgp.c down into signature.c as __ops_sign_detached()
+ don't use arrays of length 1 to hold single instances of characters, unsigned or not - just use a single character itself + misc cleanup + rename cinfo to "output" and ops_createinfo_t to "ops_output_t" to be a bit more descriptive + shorten some long names + get rid of test for libgen.h - it's not needed anymore + bump to version 0.99.4, and 20090515 sources, regenerate configure and co + numerous name changes to be more consistent and more concise + add verbosity level to the variables that can be set and retrieved by netpgp_setvar() and netpgp_getvar() + added --verbose option to netpgp(1) + add __RCSID() to all files
+ got rid of "local" header files. These aren't necessary since the openpgpsdk code was modified to all be in the same directory + added netpgp_getvar() and netpgp_setvar(), and use them to get and set the user id and hash algorithm preference + get rid of <stdbool.h> usage - I'm still not sure this is the way we should be going long term, but the bool changes got integrated with the others, and are there in cvs history if we want to resurrect them. Correct autoconf accordingly. Bump netpgp minimus version, and autoconf-based date version. + updated documentation to reflect these changes
Sync with HEAD. Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html
file keyring.c was added on branch jym-xensuspend on 2009-05-13 19:16:05 +0000
Commit the weekend's changes: + minor name changes + remove duplicated code (commented out) in packet-print.c + original code contained abstraction violations for hash size - fix them + get rid of some magic constants related to length of hash arrays + allow a choice of hash algorithms for the signature digest (rather than hardcoding SHA1 - it is looking as though collisions are easier to manufacture based on recent findings) + move default signature RSA hash algorithm to SHA256 (from SHA1). This is passed as a string parameter from the high-level interface. We'll revisit this later after a good way to specify the algorithm has been found. + display the size of the keys in --list-packets + display the keydata prior to file decryption
More cosmetic changes, no functional differences.
Change some names to something a bit less obscure. e.g. For some unfathomable reason, I find "__ops_write_mem_from_file" a bit counterintuitive - replace that by "__ops_fileread"
+ __ops_packet_t -> __ops_subpacket_t + __ops_parser_content_t -> __ops_packet_t + rename some other long names 51 chars is the record function name length so far + preliminary moves to support detached signatures as yet, incomplete + add back command line option to list packets in a signed or encrypted file + make __ops_parse() take an argument whether to print errors, and kill the __ops_parse_and_print_errors() function + get rid of some assertions in the code - this is a library - about 100 to go
WARNS=3 fixes
WARNS=4 changes
Import netpgp source into crypto/external - this is a heavily-modified version of openpgpsdk, and will replace it. Differences between netpgp and the NetBSD repository version of openpgpsdk are: + Wrap source code in GNU autoconf/configure + New high-level interface for libnetpgp(3) and netpgp(1) + Hide prolifery of local headers in the internal lib directory - there is now one exported header called netpgp.h + Hide all ops_* functions and structs behind __ops_* names + Fix long-standing bug - make decryption work with files > 8192 bytes (fix for signature verification of signed files > 8192 bytes was already brought forward from the NetBSD repository of openpgpsdk) + Use mmap(2) to read files, falls back to read(2) if can't do mmap + Compile portable package using libtool + Rationalise the number of source files - merge a number of smaller ones + Case-insensitive matching of key ids + Use PRIsize throughout + Use calloc(3) throughout to zero memory + Get rid of global symbols which abused a macro + Use more descriptive names - remove "_arg_" components, name things for their purpose, rather than what they are (their type) + No more --passphrase= argument to netpgp(1) - this is now always done through callbacks + Report source code date and build date in version number, as well as the version number itself This will form the basis of the portable netpgp package.
Initial revision