summaryrefslogtreecommitdiff
path: root/tools/sexp-conv.c
Commit message (Collapse)AuthorAgeFilesLines
* Updated FSF address. Patch from David Woodhouse.Niels Möller2012-07-071-2/+2
|
* Converted files to utf-8.Niels Möller2012-02-181-1/+1
|
* (xalloc): Deleted function, now it's in misc.c instead.Niels Möller2011-03-231-13/+0
| | | | Rev: nettle/tools/sexp-conv.c:1.6
* * tools/pkcs1-conv.c (main): Deleted short alias -? for --help,Niels Möller2010-10-221-4/+7
| | | | | | | | and fixed handling of bad options. * tools/sexp-conv.c (parse_options): Likewise. Rev: nettle/tools/pkcs1-conv.c:1.4 Rev: nettle/tools/sexp-conv.c:1.5
* * testsuite/sexp-conv-test: Updated testcases for improvedNiels Möller2009-02-101-6/+17
| | | | | | | | | | | | | | | | | | | | | | handling of comments. * tools/sexp-conv.c (sexp_convert_item): Use sexp_put_soft_newline to terminate comments, and modify indentation for the case that a list starts with a comment. * tools/output.c (sexp_output_init): Initialize soft_newline. (sexp_put_raw_char): Clear soft_newline. (sexp_put_newline): Check and reset soft_newline. (sexp_put_soft_newline): New function. * tools/output.h (struct sexp_output): Removed union with single element, and updated all users. New attribute soft_newline. Rev: nettle/ChangeLog:1.31 Rev: nettle/testsuite/sexp-conv-test:1.3 Rev: nettle/tools/output.c:1.3 Rev: nettle/tools/output.h:1.3 Rev: nettle/tools/sexp-conv.c:1.4
* (main): Fixed file locking.Niels Möller2008-10-301-1/+6
| | | | Rev: nettle/tools/sexp-conv.c:1.3
* (sexp_convert_item): Keep comments in advancedNiels Möller2008-08-271-2/+43
| | | | | | | | output. (parse_options): New --lock option. (main): Optionally lock output file. Rev: nettle/tools/sexp-conv.c:1.2
* (parse_options): New option --raw-hash, forNiels Möller2005-09-071-1/+4
| | | | | | compatibility with lsh-1.x. Equivalent to --hash. Rev: src/nettle/tools/sexp-conv.c:1.19
* (main): With --hash, output a newline afterNiels Möller2005-09-061-1/+4
| | | | | | each hash. Rev: src/nettle/tools/sexp-conv.c:1.18
* Reverted HAVE_CONFIG_H change.Niels Möller2004-10-201-1/+1
| | | | Rev: src/nettle/tools/sexp-conv.c:1.17
* Try replacing #if HAVE_CONFIG_H with #ifdef HAVE_CONFIG_H.Niels Möller2004-10-201-1/+1
| | | | Rev: src/nettle/tools/sexp-conv.c:1.16
* (xalloc): New function.Niels Möller2004-02-071-4/+19
| | | | | | (main): Use xalloc. Rev: src/nettle/tools/sexp-conv.c:1.15
* * Reordered includes in most or all .c-files. All should now includeNiels Möller2003-05-121-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.h. Rev: src/nettle/ChangeLog:1.195 Rev: src/nettle/aes-decrypt-table.c:1.4 Rev: src/nettle/aes-decrypt.c:1.5 Rev: src/nettle/aes-encrypt-table.c:1.4 Rev: src/nettle/aes-encrypt.c:1.5 Rev: src/nettle/aes-meta.c:1.3 Rev: src/nettle/aes-set-decrypt-key.c:1.2 Rev: src/nettle/aes-set-encrypt-key.c:1.2 Rev: src/nettle/aes.c:1.12 Rev: src/nettle/aesdata.c:1.2 Rev: src/nettle/arcfour-meta.c:1.2 Rev: src/nettle/arcfour.c:1.3 Rev: src/nettle/base16-decode.c:1.2 Rev: src/nettle/base16-encode.c:1.2 Rev: src/nettle/base16-meta.c:1.3 Rev: src/nettle/base64-decode.c:1.5 Rev: src/nettle/base64-encode.c:1.3 Rev: src/nettle/base64-meta.c:1.4 Rev: src/nettle/bignum-random.c:1.3 Rev: src/nettle/bignum.c:1.7 Rev: src/nettle/blowfish.c:1.4 Rev: src/nettle/buffer-init.c:1.3 Rev: src/nettle/buffer.c:1.8 Rev: src/nettle/cast128-meta.c:1.3 Rev: src/nettle/cast128.c:1.4 Rev: src/nettle/cbc.c:1.6 Rev: src/nettle/des-compat.c:1.10 Rev: src/nettle/des.c:1.7 Rev: src/nettle/des3.c:1.2 Rev: src/nettle/dsa-keygen.c:1.6 Rev: src/nettle/dsa-sign.c:1.7 Rev: src/nettle/dsa-verify.c:1.4 Rev: src/nettle/dsa.c:1.5 Rev: src/nettle/examples/io.c:1.4 Rev: src/nettle/examples/nettle-benchmark.c:1.8 Rev: src/nettle/examples/nettle-openssl.c:1.2 Rev: src/nettle/examples/rsa-keygen.c:1.10 Rev: src/nettle/examples/rsa-sign.c:1.5 Rev: src/nettle/examples/rsa-verify.c:1.4 Rev: src/nettle/hmac-md5.c:1.5 Rev: src/nettle/hmac-sha1.c:1.2 Rev: src/nettle/hmac-sha256.c:1.2 Rev: src/nettle/hmac.c:1.4 Rev: src/nettle/knuth-lfib.c:1.2 Rev: src/nettle/md5-compat.c:1.3 Rev: src/nettle/md5-meta.c:1.2 Rev: src/nettle/md5.c:1.6 Rev: src/nettle/memxor.c:1.2 Rev: src/nettle/nettle-internal.c:1.3 Rev: src/nettle/pgp-encode.c:1.4 Rev: src/nettle/pkcs1-rsa-md5.c:1.2 Rev: src/nettle/pkcs1-rsa-sha1.c:1.2 Rev: src/nettle/pkcs1.c:1.2 Rev: src/nettle/realloc.c:1.3 Rev: src/nettle/rsa-compat.c:1.8 Rev: src/nettle/rsa-decrypt.c:1.4 Rev: src/nettle/rsa-encrypt.c:1.5 Rev: src/nettle/rsa-keygen.c:1.5 Rev: src/nettle/rsa-md5-sign.c:1.2 Rev: src/nettle/rsa-md5-verify.c:1.2 Rev: src/nettle/rsa-sha1-sign.c:1.2 Rev: src/nettle/rsa-sha1-verify.c:1.2 Rev: src/nettle/rsa-sign.c:1.3 Rev: src/nettle/rsa-verify.c:1.2 Rev: src/nettle/rsa.c:1.12 Rev: src/nettle/rsa2openpgp.c:1.2 Rev: src/nettle/rsa2sexp.c:1.7 Rev: src/nettle/serpent-meta.c:1.2 Rev: src/nettle/serpent.c:1.4 Rev: src/nettle/sexp-format.c:1.9 Rev: src/nettle/sexp-transport-format.c:1.2 Rev: src/nettle/sexp-transport.c:1.4 Rev: src/nettle/sexp.c:1.14 Rev: src/nettle/sexp2bignum.c:1.5 Rev: src/nettle/sexp2dsa.c:1.4 Rev: src/nettle/sexp2rsa.c:1.11 Rev: src/nettle/sha1-meta.c:1.2 Rev: src/nettle/sha1.c:1.8 Rev: src/nettle/sha256-meta.c:1.2 Rev: src/nettle/sha256.c:1.3 Rev: src/nettle/tools/input.c:1.2 Rev: src/nettle/tools/misc.c:1.2 Rev: src/nettle/tools/output.c:1.3 Rev: src/nettle/tools/parse.c:1.2 Rev: src/nettle/tools/sexp-conv.c:1.14 Rev: src/nettle/twofish-meta.c:1.2 Rev: src/nettle/twofish.c:1.6 Rev: src/nettle/yarrow256.c:1.17 Rev: src/nettle/yarrow_key_event.c:1.4
* * tools/input.c, tools/input.h, tools/output.c, tools/output.h,Niels Möller2003-01-121-1051/+34
| | | | | | | | | | | | | | | | tools/parse.c, tools/parse.h, tools/misc.c, tools/misc.h: Moved parts ov sexp-conv.c to separate files Rev: src/nettle/tools/Makefile.am:1.3 Rev: src/nettle/tools/input.c:1.1 Rev: src/nettle/tools/input.h:1.1 Rev: src/nettle/tools/misc.c:1.1 Rev: src/nettle/tools/misc.h:1.1 Rev: src/nettle/tools/output.c:1.1 Rev: src/nettle/tools/output.h:1.1 Rev: src/nettle/tools/parse.c:1.1 Rev: src/nettle/tools/parse.h:1.1 Rev: src/nettle/tools/sexp-conv.c:1.13
* * tools/sexp-conv.c (sexp_parse): Take a struct sexp_compound_token *Niels Möller2003-01-121-36/+64
| | | | | | | as argument. Updated all callers. Simplified handling of display types and transport encoding. Rev: src/nettle/tools/sexp-conv.c:1.12
* * tools/sexp-conv.c (struct sexp_input): Deleted string attribute.Niels Möller2003-01-121-24/+81
| | | | | | | | | | | | Changed all related functions to take a struct nettle_buffer * argument instead. (struct sexp_compound_token): New struct. (sexp_compound_token_init, sexp_compound_token_clear): New functions. (struct sexp_parser): Added a struct sexp_compound_token attribute, as a temporary measure. Rev: src/nettle/tools/sexp-conv.c:1.11
* * tools/sexp-conv.c (struct sexp_parser): Renamed struct (wasNiels Möller2003-01-121-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | struct sexp_parse_state). Added input pointer. Updated users to not pass around both parser and input. (sexp_check_token): handle token == 0. (sexp_parse): Simplified a little by calling sexp_check_token unconditionally. * tools/sexp-conv.c (sexp_convert_string): Deleted function. (sexp_skip_token): Likewise. * tools/sexp-conv.c (enum sexp_token): New constant SEXP_DISPLAY. Start constants from 1, to keep 0 free for special uses. (struct sexp_parse_state): New struct for keeping track of parser state. (sexp_parse_init): New function. (sexp_check_token): New function, replacing sexp_skip_token. (sexp_parse): New function. (sexp_convert_item): Simplified by using sexp_parse. (sexp_convert_list): Use sexp_parse. (main): Likewise. Rev: src/nettle/tools/sexp-conv.c:1.10
* (struct sexp_parser): Renamed struct (was structNiels Möller2003-01-121-48/+48
| | | | | | | sexp_parse_state). Added input pointer. Updated users to not pass around both parser and input. Rev: src/nettle/tools/sexp-conv.c:1.9
* * tools/sexp-conv.c (sexp_convert_string): Deleted function.Niels Möller2003-01-121-37/+0
| | | | | | | | | | | | | | | | | (sexp_skip_token): Likewise. * tools/sexp-conv.c (enum sexp_token): New constant SEXP_DISPLAY. Start constants from 1, to keep 0 free for special uses. (struct sexp_parse_state): New struct for keeping track of parser state. (sexp_parse_init): New function. (sexp_check_token): New function, replacing sexp_skip_token. (sexp_parse): New function. (sexp_convert_item): Simplified by using sexp_parse. (sexp_convert_list): Use sexp_parse. (main): Likewise. Rev: src/nettle/tools/sexp-conv.c:1.8
* (enum sexp_token): New constant SEXP_DISPLAY.Niels Möller2003-01-121-25/+174
| | | | | | | | | | | | | | Start constants from 1, to keep 0 free for special uses. (struct sexp_parse_state): New struct for keeping track of parser state. (sexp_parse_init): New function. (sexp_check_token): New function, replacing sexp_skip_token. (sexp_parse): New function. (sexp_convert_item): Simplified by using sexp_parse. (sexp_convert_list): Use sexp_parse. (main): Likewise. Rev: src/nettle/tools/sexp-conv.c:1.7
* (parse_options): Initialize prefer_hex.Niels Möller2003-01-081-0/+1
| | | | Rev: src/nettle/tools/sexp-conv.c:1.6
* (sexp_put_string): Print binary strings usingNiels Möller2003-01-011-7/+32
| | | | | | | | either hex or base 64 (in advanced mode). (parse_options): Implemented -s hex, for output using hex rather than base64. Rev: src/nettle/tools/sexp-conv.c:1.5
* Added GPL blurb.Niels Möller2002-11-111-0/+20
| | | | Rev: src/nettle/tools/sexp-conv.c:1.4
* * tools/sexp-conv.c (sexp_get_token_string): Fixed end of fileNiels Möller2002-11-101-6/+7
| | | | | | | | handling. (sexp_get_string): Fixed end of encoding/end of file handling. (parse_options): Check for negative width and complain. Rev: src/nettle/tools/sexp-conv.c:1.3
* Use supplied getopt.Niels Möller2002-11-101-70/+283
| | | | | | | | | | | | | | | | | (werror): New function. (sexp_output_hash_init): New function. (sexp_put_char): Made base64 linebreaking configurable. Implemented hashing. (sexp_put_code_start, sexp_put_code_end): Don't output any delimiters here. (sexp_put_string): Output base64 delimiters. (sexp_put_digest): New function. (sexp_convert_item): Output transport delimiters. (sexp_convert_file): Deleted function, folded with main. (parse_options): New function. (main): Implemented --hash and --once, needed by lsh-authorize. Rev: src/nettle/tools/sexp-conv.c:1.2
* New files.Niels Möller2002-11-071-0/+927
Rev: src/nettle/tools/Makefile.am:1.1 Rev: src/nettle/tools/getopt.c:1.1 Rev: src/nettle/tools/getopt.h:1.1 Rev: src/nettle/tools/getopt1.c:1.1 Rev: src/nettle/tools/sexp-conv.c:1.1