Up to [cvs.NetBSD.org] / src / crypto / external / bsd / netpgp / dist / src / lib
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
adding initial support for ECDSA (19) to netpgp. tested using p256/sha256, p384/sha384, and p521/sha512
Rebase to HEAD as of a few days ago.
sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments")
Update to version 20140220 Changes from previous version: + portability fixes from xtraeme for his Linux distribution: + add search for ar(1) into autoconf + define __printflike if it's not already defined + fix missing asprintf (I fixed this differently)
Update the autoconf-based infrastructure for another release. The main change in this infrastructure is to get rid of the libnetpgp-based netpgpverify. This functionality is provided by the standalone netpgpverify and libnetpgpverify in pkgsrc, and verification can also be performed using "netpgp -v".
Changes to 3.99.15/20101110 + add support for partial blocks, defined in rfc 4880, and used fairly extensively by gnupg where the input size may not be known in advance (e.g. for encrypted compressed data, as produced by default by gpg -e)
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.
Update to version 3.99.13: + add ability in netpgpkeys(1) to specify the cipher (symmetric algorithm) as specified in RFC 5581 + add the camellia cipher implementation from openssl
Changes to 3.99.12/20100907 + add a pretty print function mj_pretty(3) to libmj + added netpgp_write_sshkey(3) to libnetpgp + added pgp2ssh(1) + added preliminary support for ElGamal decryption, needed for DSA keys as yet untested, unworking, and a WIP + add support for using all ssh keys, even those protected by a passphrase, for decryption and signing. This rounds off ssh key file support in netpgp. + add a single character alias [-S file] for [--sshkeyfile file] to netpgpkeys(1) and netpgp(1) As far as ssh key file support goes, see the following example: % cp configure a % netpgp -S ~/.ssh/id_rsa.pub -e a % netpgp -S ~/.ssh/id_rsa.pub -d a.gpg Enter PEM pass phrase: % ls -al a a.gpg -rwxr-xr-x 1 agc agc 758398 Sep 7 05:38 a -rw------- 1 agc agc 156886 Sep 7 05:38 a.gpg %
move the functions to parse the JSON from netpgpkeys(1) into libnetpgp(3) update the version number for recent changes. update the date for recent changes. regenerate the autoconf files.
Bump version number for latest changes
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) %
commit version number change
Update netpgp to 3.99.3 Changes since 3.99.2: + avoid possible free() of new value passed to netpgp_setvar(), with thanks to Anon Ymous. + netpgpkeys(1): print keys to stdout, not stderr - reported by Anon Ymous. + fix DSA signatures and verification + 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. + add some checking to new key generation, and don't try to read in the keys after writing them - reported by Tyler Retzlaff
regen for netpgp 3.99.2, 20100507 version
Update netpgp to version 3.99.1 Changes to 3.99.1/20100413 + bump major command versions to be compatible with shlib major + fixed a number of bugs in (RSA) key generation + modified netpgpkeys(1) to take an optional argument to --generate-key if the argument is provided, it is used as the equivalent of the gecos field for the newly-generated key.
Changes to 2.99.2/20100315 + make subkey sigs available by hkp as well as on the command line + use the sketchily-defined vindex option to the hkp protocol to return the subkey signature information + add a netpgp_unsetvar() function as a corollary to netpgp_setvar() + use a variable name of ''subkey sigs'' to denote that subkey signatures should be returned with the pubkey uids
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
Changes to 1.99.22/20100307 + add key expiry information to public key information display
Changes to 1.99.21/20100305 + clean up some lint + the obligatory ''build on mac os x fixes'' - <inttypes.h> header file
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.19/20100212 + plug some memory leaks, from cppcheck via Thomas Klausner (thanks!) + make the singular of time units read correctly + print decryption key info properly when prompting for passphrase
changes to 1.99.18/20100211 small steps, but lots of them - this is the first one. + print out the correct key information when signing files and memory. what used to be printed out was the copy of the public key which is stored as part of the private key(!). does not address the info shown when decrypting, since that is done in a different way, by callback. this whole part needs to be re-written, but will have to wait for two good hands.
Update netpgp to version 1.99.17/20100208 Changes to 1.99.17/20100208 + get rid of last 2 static variables - use the __ops_printstate_t struct passed down, and add the indent variable here too + get rid of 3 occurrences in reader.c where an automatic buffer was addressed (as part of a subsequent callback) by a struct field from a calling scope, and only valid within the callback. Found by Flexelint and phk - many thanks. + print filename/"memory" when time problems occur when validating signatures
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
Netpgp changes to 1.99.15/20091221 + some ssh host keys do not have the username of the generator included in the key itself. If there is no username in there, create one. + added netpgp_encrypt_memory() and netpgp_decrypt_memory() + overhaul netpgp(1) to work with stdin/stdout if no filenames specified: % netpgp --encrypt < a | netpgp --decrypt > b netpgp: default key set to "C0596823" netpgp: default key set to "C0596823" pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks <agc@netbsd.org> uid Alistair Crooks <agc@pkgsrc.org> uid Alistair Crooks <agc@alistaircrooks.com> uid Alistair Crooks <alistair@hockley-crooks.com> netpgp passphrase: % diff a b % ls -al a b -rw-r--r-- 1 agc agc 15243 Dec 20 08:55 a -rw-r--r-- 1 agc agc 15243 Dec 21 17:15 b % % netpgp --sign < a | netpgp --cat > b netpgp: default key set to "C0596823" netpgp: default key set to "C0596823" pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks <agc@netbsd.org> uid Alistair Crooks <agc@pkgsrc.org> uid Alistair Crooks <agc@alistaircrooks.com> uid Alistair Crooks <alistair@hockley-crooks.com> netpgp passphrase: Good signature for <stdin> made Mon Dec 21 18:25:02 2009 using RSA (Encrypt or Sign) key 1b68dcfcc0596823 pub 2048/RSA (Encrypt or Sign) 1b68dcfcc0596823 2004-01-12 Key fingerprint: d415 9deb 336d e4cc cdfa 00cd 1b68 dcfc c059 6823 uid Alistair Crooks <alistair@hockley-crooks.com> uid Alistair Crooks <agc@pkgsrc.org> uid Alistair Crooks <agc@netbsd.org> uid Alistair Crooks <agc@alistaircrooks.com> uid Alistair Crooks (Yahoo!) <agcrooks@yahoo-inc.com> % + add explanations of memory-based operations to manual pages
Bump the netpgp base version to 1.99.14 for the release changes.
Don't complain if $HOME/.gnupg does not exist (and using --homedir). Don't require a userid to be set in the gpg.conf file - it can be set on the command line when it's needed (for signing and encryption, the other operations in netpgp(1) will take the userid from the signed/encrypted file). Add tests for the lack of a default userid in the config file.
Update to version 1.99.12 CHANGES 1.99.11 -> 1.99.12 + only prompt for the passphrase for the secret key if the secret key is protected by a passphrase + portability fix for Mac OS X
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
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.5 -> 1.99.6 + made --homedir=d consistent with POLS. Default is $HOME/.gnupg, and if a directory is specified with --homedir=d, the directory containing conf file and keyrings is taken to be "d".
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.2 -> 1.99.3 + modified regression tests to make it easier to see status messages + modified --encrypt, --decrypt, --sign, and --clearsign as well as --cat to respect the --output argument for the output file. Default behaviour remains unchanged - if --output is not specified, standard file names and suffixes apply. Note that --verify has not been changed - this is for compatibility with gpg, POLA/POLS, and because --verify-cat/--cat provides this behaviour
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()
+ some more name changes + we've had the ability to sign files with a detached signature for a while now. We can now verify the files using the detached signature file. + in honour of this, update version numbers - 1.0.0/20090517
+ 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 version.h was added on branch jym-xensuspend on 2009-05-13 19:16:06 +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
+ add a --help option + if setrlimit exists, set the core dump size to be 0 (with thanks to mrg for the reference implementation) + get rid of __ops_start_cleartext_sig/__ops_start_msg_sig abstractions and just "export" the __ops_start_sig function - the function is not actually exported, just usable by other __ops functions + bump internal version number to 0.99.2, autoconf version to 20090506 + prettify usage message output
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