summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-11-28 15:27:33 +0100
committerJustus Winter <justus@sequoia-pgp.org>2019-11-28 16:26:43 +0100
commitbbbc6da375d6584c7b2bcc74e838fff943f489d4 (patch)
tree0a965698c96dbc0fc8541c6adc2224935b68bc07
parentf53c77752ff04c3713c175a76a06723042e681ae (diff)
Call TPKs Certificates, update identifiers, documentation.
- Fixes #387.
-rw-r--r--examples/guide-exploring-openpgp.rs16
-rw-r--r--examples/guide-the-keystore.rs14
-rw-r--r--ffi-macros/src/rust2c.rs2
-rw-r--r--ffi/examples/keyserver.c10
-rw-r--r--ffi/include/sequoia/net.h4
-rw-r--r--ffi/include/sequoia/store.h56
-rw-r--r--ffi/lang/python/sequoia/net.py8
-rw-r--r--ffi/lang/python/sequoia/openpgp.py26
-rw-r--r--ffi/lang/python/sequoia/store.py28
-rw-r--r--ffi/lang/python/tests/test_cert.py (renamed from ffi/lang/python/tests/test_tpk.py)22
-rw-r--r--ffi/src/error.rs8
-rw-r--r--ffi/src/lib.rs10
-rw-r--r--ffi/src/net.rs16
-rw-r--r--ffi/src/store.rs80
-rw-r--r--guide/src/chapter_01.md92
-rw-r--r--guide/src/chapter_02.md76
-rw-r--r--guide/src/chapter_03.md32
-rw-r--r--ipc/examples/gpg-agent-decrypt.rs40
-rw-r--r--ipc/examples/gpg-agent-sign.rs14
-rw-r--r--ipc/tests/gpg-agent.rs36
-rw-r--r--net/src/lib.rs22
-rw-r--r--net/src/wkd.rs104
-rw-r--r--net/tests/hkp.rs6
-rw-r--r--openpgp-ffi/examples/decrypt-with.c30
-rw-r--r--openpgp-ffi/examples/encrypt-for.c16
-rw-r--r--openpgp-ffi/examples/example.c12
-rw-r--r--openpgp-ffi/examples/generate-key.c14
-rw-r--r--openpgp-ffi/examples/reader.c12
-rw-r--r--openpgp-ffi/include/sequoia/openpgp.h244
-rw-r--r--openpgp-ffi/include/sequoia/openpgp/error.h8
-rw-r--r--openpgp-ffi/include/sequoia/openpgp/serialize.h4
-rw-r--r--openpgp-ffi/include/sequoia/openpgp/types.h44
-rw-r--r--openpgp-ffi/src/cert.rs (renamed from openpgp-ffi/src/tpk.rs)460
-rw-r--r--openpgp-ffi/src/common.rs2
-rw-r--r--openpgp-ffi/src/error.rs20
-rw-r--r--openpgp-ffi/src/lib.rs8
-rw-r--r--openpgp-ffi/src/parse/stream.rs114
-rw-r--r--openpgp-ffi/src/revocation_status.rs2
-rw-r--r--openpgp-ffi/src/serialize.rs6
-rw-r--r--openpgp-ffi/src/tsk.rs8
-rw-r--r--openpgp/examples/decrypt-with.rs34
-rw-r--r--openpgp/examples/encrypt-for.rs10
-rw-r--r--openpgp/examples/generate-encrypt-decrypt.rs18
-rw-r--r--openpgp/examples/generate-sign-verify.rs22
-rw-r--r--openpgp/examples/notarize.rs2
-rw-r--r--openpgp/examples/pad.rs10
-rw-r--r--openpgp/examples/sign-detached.rs2
-rw-r--r--openpgp/examples/sign.rs2
-rw-r--r--openpgp/examples/statistics.rs70
-rw-r--r--openpgp/examples/web-of-trust.rs16
-rw-r--r--openpgp/src/armor.rs2
-rw-r--r--openpgp/src/autocrypt.rs98
-rw-r--r--openpgp/src/cert/bindings.rs (renamed from openpgp/src/tpk/bindings.rs)122
-rw-r--r--openpgp/src/cert/builder.rs (renamed from openpgp/src/tpk/builder.rs)154
-rw-r--r--openpgp/src/cert/keyiter.rs (renamed from openpgp/src/tpk/keyiter.rs)74
-rw-r--r--openpgp/src/cert/mod.rs (renamed from openpgp/src/tpk/mod.rs)1070
-rw-r--r--openpgp/src/cert/parser/low_level/grammar.lalrpop (renamed from openpgp/src/tpk/parser/low_level/grammar.lalrpop)26
-rw-r--r--openpgp/src/cert/parser/low_level/grammar.rs2
-rw-r--r--openpgp/src/cert/parser/low_level/lexer.rs (renamed from openpgp/src/tpk/parser/low_level/lexer.rs)8
-rw-r--r--openpgp/src/cert/parser/low_level/mod.rs (renamed from openpgp/src/tpk/parser/low_level/mod.rs)16
-rw-r--r--openpgp/src/cert/parser/mod.rs (renamed from openpgp/src/tpk/parser/mod.rs)302
-rw-r--r--openpgp/src/cert/revoke.rs (renamed from openpgp/src/tpk/revoke.rs)142
-rw-r--r--openpgp/src/crypto/hash.rs28
-rw-r--r--openpgp/src/crypto/keygrip.rs6
-rw-r--r--openpgp/src/crypto/mpis.rs6
-rw-r--r--openpgp/src/lib.rs16
-rw-r--r--openpgp/src/packet/key/mod.rs22
-rw-r--r--openpgp/src/packet/pkesk.rs22
-rw-r--r--openpgp/src/packet/signature/mod.rs28
-rw-r--r--openpgp/src/packet/tag.rs6
-rw-r--r--openpgp/src/parse/packet_parser_builder.rs2
-rw-r--r--openpgp/src/parse/parse.rs70
-rw-r--r--openpgp/src/parse/stream.rs118
-rw-r--r--openpgp/src/serialize/cert.rs (renamed from openpgp/src/serialize/tpk.rs)290
-rw-r--r--openpgp/src/serialize/cert_armored.rs (renamed from openpgp/src/serialize/tpk_armored.rs)66
-rw-r--r--openpgp/src/serialize/mod.rs30
-rw-r--r--openpgp/src/serialize/stream.rs50
-rw-r--r--openpgp/src/tests.rs2
-rw-r--r--openpgp/src/tpk/parser/low_level/grammar.rs2
-rw-r--r--openpgp/tests/data/keys/really-revoked-cert-0-public.pgp (renamed from openpgp/tests/data/keys/really-revoked-tpk-0-public.pgp)bin1751 -> 1751 bytes
-rw-r--r--openpgp/tests/data/keys/really-revoked-cert-0-secret.pgp (renamed from openpgp/tests/data/keys/really-revoked-tpk-0-secret.pgp)bin3693 -> 3693 bytes
-rw-r--r--openpgp/tests/data/keys/really-revoked-cert-1-soft-revocation.pgp (renamed from openpgp/tests/data/keys/really-revoked-tpk-1-soft-revocation.pgp)bin2223 -> 2223 bytes
-rw-r--r--openpgp/tests/data/keys/really-revoked-cert-2-new-self-sig.pgp (renamed from openpgp/tests/data/keys/really-revoked-tpk-2-new-self-sig.pgp)bin1751 -> 1751 bytes
-rw-r--r--openpgp/tests/data/keys/really-revoked-cert-3-hard-revocation.pgp (renamed from openpgp/tests/data/keys/really-revoked-tpk-3-hard-revocation.pgp)bin2204 -> 2204 bytes
-rw-r--r--openpgp/tests/data/keys/really-revoked-cert-4-new-self-sig.pgp (renamed from openpgp/tests/data/keys/really-revoked-tpk-4-new-self-sig.pgp)bin1751 -> 1751 bytes
-rw-r--r--openpgp/tests/for-each-artifact.rs10
-rw-r--r--sqv/src/sqv.rs54
-rw-r--r--sqv/tests/multiple-signatures.rs4
-rw-r--r--sqv/tests/revoked-key.rs6
-rw-r--r--sqv/tests/wrong-key-flags.rs8
-rw-r--r--store/src/backend/mod.rs40
-rw-r--r--store/src/lib.rs188
-rw-r--r--store/src/store_protocol.capnp4
-rw-r--r--tool/src/commands/decrypt.rs12
-rw-r--r--tool/src/commands/dump.rs6
-rw-r--r--tool/src/commands/inspect.rs37
-rw-r--r--tool/src/commands/key.rs10
-rw-r--r--tool/src/commands/mod.rs62
-rw-r--r--tool/src/commands/sign.rs6
-rw-r--r--tool/src/sq-usage.rs52
-rw-r--r--tool/src/sq.rs98
-rw-r--r--tool/src/sq_cli.rs30
-rw-r--r--tool/tests/sq-sign.rs42
103 files changed, 2685 insertions, 2676 deletions
diff --git a/examples/guide-exploring-openpgp.rs b/examples/guide-exploring-openpgp.rs
index cff65378..c4d15bf9 100644
--- a/examples/guide-exploring-openpgp.rs
+++ b/examples/guide-exploring-openpgp.rs
@@ -4,7 +4,7 @@ extern crate sequoia_openpgp as openpgp;
use crate::openpgp::parse::Parse;
fn main() {
- let tpk =
+ let cert =
"-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBFpxtsABCADZcBa1Q3ZLZnju18o0+t8LoQuIIeyeUQ0H45y6xUqyrD5HSkVM
@@ -36,8 +36,8 @@ fn main() {
=lAie
-----END PGP PUBLIC KEY BLOCK-----";
- // Parse the TPK.
- let pile = openpgp::PacketPile::from_bytes(tpk).unwrap();
+ // Parse the Cert.
+ let pile = openpgp::PacketPile::from_bytes(cert).unwrap();
// Iterate over children.
for (i, p) in pile.children().enumerate() {
@@ -47,12 +47,12 @@ fn main() {
// Some space to make the output easier to parse.
println!();
- // Parse into TPK.
- let tpk = openpgp::TPK::from_packet_pile(pile).unwrap();
- println!("Fingerprint: {}", tpk.fingerprin