summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2018-11-24 12:24:31 +0100
committerJustus Winter <justus@sequoia-pgp.org>2018-11-24 12:54:04 +0100
commit00379cb1cb9d0b38cdb7b50e5471b45b1ebecd23 (patch)
tree96e9eeb3257fcff8fe4d972eb5f9d3ed096160ad
parent552350974b008e5de4b92a2c063927066f213df1 (diff)
Rename the openpgp crate to sequoia-openpgp.
-rw-r--r--Cargo.toml2
-rw-r--r--examples/guide-exploring-openpgp.rs2
-rw-r--r--examples/guide-getting-started.rs2
-rw-r--r--examples/guide-the-keystore.rs2
-rw-r--r--ffi/Cargo.toml2
-rw-r--r--ffi/src/error.rs2
-rw-r--r--ffi/src/net.rs2
-rw-r--r--ffi/src/openpgp.rs2
-rw-r--r--ffi/src/store.rs2
-rw-r--r--net/Cargo.toml2
-rw-r--r--net/src/lib.rs4
-rw-r--r--net/tests/hkp.rs2
-rw-r--r--openpgp/Cargo.toml4
-rw-r--r--openpgp/examples/decrypt-with.rs2
-rw-r--r--openpgp/examples/encrypt-for.rs2
-rw-r--r--openpgp/examples/notarize.rs2
-rw-r--r--openpgp/examples/sign-detached.rs2
-rw-r--r--openpgp/examples/sign.rs2
-rw-r--r--openpgp/examples/statistics.rs2
-rw-r--r--openpgp/examples/wrap-literal.rs2
-rw-r--r--openpgp/src/armor.rs9
-rw-r--r--openpgp/src/fingerprint.rs1
-rw-r--r--openpgp/src/lib.rs2
-rw-r--r--openpgp/src/packet/signature/subpacket.rs1
-rw-r--r--openpgp/src/packet_pile.rs3
-rw-r--r--openpgp/src/parse/map.rs1
-rw-r--r--openpgp/src/parse/packet_parser_builder.rs1
-rw-r--r--openpgp/src/parse/packet_pile_parser.rs1
-rw-r--r--openpgp/src/parse/parse.rs2
-rw-r--r--openpgp/src/parse/stream.rs4
-rw-r--r--openpgp/src/serialize/stream.rs7
-rw-r--r--openpgp/src/tpk/mod.rs4
-rw-r--r--src/lib.rs4
-rw-r--r--store/Cargo.toml2
-rw-r--r--store/src/lib.rs32
-rw-r--r--tool/Cargo.toml2
-rw-r--r--tool/src/commands/decrypt.rs2
-rw-r--r--tool/src/commands/dump.rs2
-rw-r--r--tool/src/commands/mod.rs2
-rw-r--r--tool/src/sq.rs2
-rw-r--r--tool/src/sqv.rs2
-rw-r--r--tool/tests/sq-sign.rs2
42 files changed, 73 insertions, 59 deletions
diff --git a/Cargo.toml b/Cargo.toml
index b6a0591c..00864bf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
buffered-reader = { path = "buffered-reader", version = "0.1.0" }
-openpgp = { path = "openpgp", version = "0.1.0" }
+sequoia-openpgp = { path = "openpgp", version = "0.1.0" }
sequoia-core = { path = "core", version = "0.1.0" }
sequoia-ffi = { path = "ffi", version = "0.1.0" }
sequoia-net = { path = "net", version = "0.1.0" }
diff --git a/examples/guide-exploring-openpgp.rs b/examples/guide-exploring-openpgp.rs
index 87763aee..88d4559d 100644
--- a/examples/guide-exploring-openpgp.rs
+++ b/examples/guide-exploring-openpgp.rs
@@ -1,7 +1,7 @@
//! https://sequoia-pgp.org/guide/exploring-openpgp/
#[macro_use] // For armored!
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
fn main() {
let mut reader = armored!(
diff --git a/examples/guide-getting-started.rs b/examples/guide-getting-started.rs
index 9efff752..940f9032 100644
--- a/examples/guide-getting-started.rs
+++ b/examples/guide-getting-started.rs
@@ -1,7 +1,7 @@
//! https://sequoia-pgp.org/guide/getting-started/
#[macro_use] // For armored!
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use std::io;
fn main() {
diff --git a/examples/guide-the-keystore.rs b/examples/guide-the-keystore.rs
index c5c6f361..8ede6ac9 100644
--- a/examples/guide-the-keystore.rs
+++ b/examples/guide-the-keystore.rs
@@ -1,7 +1,7 @@
//! https://sequoia-pgp.org/guide/the-keystore/
#[macro_use] // For armored!
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
extern crate sequoia;
use sequoia::{core, store};
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
index b666ead3..eb3d050b 100644
--- a/ffi/Cargo.toml
+++ b/ffi/Cargo.toml
@@ -21,7 +21,7 @@ gitlab = { repository = "https://gitlab.com/sequoia-pgp/sequoia" }
maintenance = { status = "actively-developed" }
[dependencies]
-openpgp = { path = "../openpgp" }
+sequoia-openpgp = { path = "../openpgp" }
sequoia-core = { path = "../core" }
sequoia-store = { path = "../store" }
sequoia-net = { path = "../net" }
diff --git a/ffi/src/error.rs b/ffi/src/error.rs
index 9d4b9388..75fa4f3e 100644
--- a/ffi/src/error.rs
+++ b/ffi/src/error.rs
@@ -5,7 +5,7 @@ use std::io;
use std::ffi::CString;
use libc::c_char;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use sequoia_core as core;
/// Frees an error.
diff --git a/ffi/src/net.rs b/ffi/src/net.rs
index bc3dc928..416cedcf 100644
--- a/ffi/src/net.rs
+++ b/ffi/src/net.rs
@@ -33,7 +33,7 @@ use std::ffi::CStr;
use std::ptr;
use std::slice;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use self::openpgp::TPK;
use self::openpgp::KeyID;
diff --git a/ffi/src/openpgp.rs b/ffi/src/openpgp.rs
index 8d1486e4..d772f2ef 100644
--- a/ffi/src/openpgp.rs
+++ b/ffi/src/openpgp.rs
@@ -11,7 +11,7 @@ use std::io::{Read, Write};
use libc::{self, uint8_t, uint64_t, c_char, c_int, size_t, ssize_t, c_void};
use failure::ResultExt;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use self::openpgp::{
armor,
diff --git a/ffi/src/store.rs b/ffi/src/store.rs
index 0197faa9..a18239f7 100644
--- a/ffi/src/store.rs
+++ b/ffi/src/store.rs
@@ -27,7 +27,7 @@ use libc::{uint8_t, uint64_t, c_char};
use std::ffi::{CStr, CString};
use std::ptr;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use self::openpgp::TPK;
use self::openpgp::{
diff --git a/net/Cargo.toml b/net/Cargo.toml
index 7b78d459..1c9d7f80 100644
--- a/net/Cargo.toml
+++ b/net/Cargo.toml
@@ -20,7 +20,7 @@ gitlab = { repository = "https://gitlab.com/sequoia-pgp/sequoia" }
maintenance = { status = "actively-developed" }
[dependencies]
-openpgp = { path = "../openpgp" }
+sequoia-openpgp = { path = "../openpgp" }
sequoia-core = { path = "../core" }
capnp-rpc = "0.9"
diff --git a/net/src/lib.rs b/net/src/lib.rs
index 0e730b18..07c274b1 100644
--- a/net/src/lib.rs
+++ b/net/src/lib.rs
@@ -14,7 +14,7 @@
//! [SKS keyserver]: https://www.sks-keyservers.net/overview-of-pools.php#pool_hkps
//!
//! ```no_run
-//! # extern crate openpgp;
+//! # extern crate sequoia_openpgp as openpgp;
//! # extern crate sequoia_core;
//! # extern crate sequoia_net;
//! # use openpgp::KeyID;
@@ -32,7 +32,7 @@
#![warn(missing_docs)]
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
extern crate sequoia_core;
#[macro_use]
diff --git a/net/tests/hkp.rs b/net/tests/hkp.rs
index cbb86532..209d5f98 100644
--- a/net/tests/hkp.rs
+++ b/net/tests/hkp.rs
@@ -18,7 +18,7 @@ use std::io::Cursor;
use std::net::{SocketAddr, IpAddr, Ipv4Addr};
use std::thread;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
extern crate sequoia_core;
extern crate sequoia_net;
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index 36a28824..f64dfc56 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "openpgp"
+name = "sequoia-openpgp"
description = "OpenPGP data types and associated machinery"
version = "0.1.0"
authors = [
@@ -8,7 +8,7 @@ authors = [
"Neal H. Walfield <neal@sequoia-pgp.org>",
]
build = "build.rs"
-documentation = "https://docs.sequoia-pgp.org/openpgp"
+documentation = "https://docs.sequoia-pgp.org/sequoia_openpgp"
homepage = "https://sequoia-pgp.org/"
repository = "https://gitlab.com/sequoia-pgp/sequoia"
readme = "../README.md"
diff --git a/openpgp/examples/decrypt-with.rs b/openpgp/examples/decrypt-with.rs
index 5c3f1a28..6ac419ed 100644
--- a/openpgp/examples/decrypt-with.rs
+++ b/openpgp/examples/decrypt-with.rs
@@ -6,7 +6,7 @@ use std::env;
use std::io;
extern crate failure;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use openpgp::parse::stream::{
Decryptor, DecryptionHelper, Secret, VerificationHelper, VerificationResult,
diff --git a/openpgp/examples/encrypt-for.rs b/openpgp/examples/encrypt-for.rs
index be2f1cc5..a95af3d6 100644
--- a/openpgp/examples/encrypt-for.rs
+++ b/openpgp/examples/encrypt-for.rs
@@ -4,7 +4,7 @@
use std::env;
use std::io;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use openpgp::armor;
use openpgp::constants::DataFormat;
use openpgp::serialize::stream::{
diff --git a/openpgp/examples/notarize.rs b/openpgp/examples/notarize.rs
index 126eb657..b607eaae 100644
--- a/openpgp/examples/notarize.rs
+++ b/openpgp/examples/notarize.rs
@@ -4,7 +4,7 @@
use std::env;
use std::io;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use openpgp::{
armor,
Packet,
diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs
index a9764db8..d94bab97 100644
--- a/openpgp/examples/sign-detached.rs
+++ b/openpgp/examples/sign-detached.rs
@@ -3,7 +3,7 @@
use std::env;
use std::io;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use openpgp::armor;
use openpgp::serialize::stream::{Message, Signer};
diff --git a/openpgp/examples/sign.rs b/openpgp/examples/sign.rs
index 53bc158c..39e3e686 100644
--- a/openpgp/examples/sign.rs
+++ b/openpgp/examples/sign.rs
@@ -3,7 +3,7 @@
use std::env;
use std::io;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use openpgp::armor;
use openpgp::constants::DataFormat;
use openpgp::serialize::stream::{Message, LiteralWriter, Signer};
diff --git a/openpgp/examples/statistics.rs b/openpgp/examples/statistics.rs
index ad777549..ff2a9cf9 100644
--- a/openpgp/examples/statistics.rs
+++ b/openpgp/examples/statistics.rs
@@ -7,7 +7,7 @@
/// % cargo run -p openpgp --example statistics --release
use std::env;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use openpgp::Packet;
use openpgp::constants::SignatureType;
use openpgp::packet::{BodyLength, Tag};
diff --git a/openpgp/examples/wrap-literal.rs b/openpgp/examples/wrap-literal.rs
index 335bf307..ba72a041 100644
--- a/openpgp/examples/wrap-literal.rs
+++ b/openpgp/examples/wrap-literal.rs
@@ -6,7 +6,7 @@
use std::env;
use std::io;
-extern crate openpgp;
+extern crate sequoia_openpgp as openpgp;
use openpgp::armor;
use openpgp::constants::DataFormat;
use openpgp::serialize::stream::{Message, LiteralWriter};
diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs
index fba6b8bb..772f3dcd 100644
--- a/openpgp/src/armor.rs
+++ b/openpgp/src/armor.rs
@@ -17,6 +17,7 @@
//! # Example
//!
//! ```rust, no_run
+//! extern crate sequoia_openpgp as openpgp;
//! use std::fs::File;
//! use openpgp::armor::{Reader, Kind};
//!
@@ -152,7 +153,7 @@ impl<W: Write> Writer<W> {
///
/// ```
/// # use std::io::Write;
- /// # extern crate openpgp;
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::armor::{Writer, Kind};
/// # use std::io::{self, Result};
/// # fn main() { f().unwrap(); }
@@ -384,7 +385,7 @@ impl<'a> Reader<'a> {
///
/// ```
/// # use std::io::Read;
- /// # extern crate openpgp;
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::{Result, Message};
/// # use openpgp::armor::Reader;
/// # use std::io;
@@ -409,7 +410,7 @@ impl<'a> Reader<'a> {
///
/// ```
/// # use std::io::Read;
- /// # extern crate openpgp;
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::armor::{Reader, Kind};
/// # use std::io::{self, Result};
/// # fn main() { f().unwrap(); }
@@ -952,7 +953,7 @@ impl<'a> Read for Reader<'a> {
///
/// ```
/// use std::io::Read;
-/// #[macro_use] extern crate openpgp;
+/// #[macro_use] extern crate sequoia_openpgp as openpgp;
/// # use std::io::Result;
/// # fn main() { f().unwrap(); }
/// # fn f() -> Result<()> {
diff --git a/openpgp/src/fingerprint.rs b/openpgp/src/fingerprint.rs
index b0ad4f1d..58c0fbe2 100644
--- a/openpgp/src/fingerprint.rs
+++ b/openpgp/src/fingerprint.rs
@@ -37,6 +37,7 @@ impl Fingerprint {
/// # Example
///
/// ```
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::Fingerprint;
/// let hex = "3E8877C877274692975189F5D03F6F865226FE8B";
/// let fp = Fingerprint::from_hex(hex);
diff --git a/openpgp/src/lib.rs b/openpgp/src/lib.rs
index e459c230..5cfa80b9 100644
--- a/openpgp/src/lib.rs
+++ b/openpgp/src/lib.rs
@@ -372,7 +372,7 @@ pub struct PacketPile {
/// # Example
///
/// ```rust
-/// # extern crate openpgp;
+/// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::Result;
/// # use openpgp::parse::{PacketParserResult, PacketParser};
/// use openpgp::TPK;
diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs
index 9ea38943..ed8e4c4e 100644
--- a/openpgp/src/packet/signature/subpacket.rs
+++ b/openpgp/src/packet/signature/subpacket.rs
@@ -31,6 +31,7 @@
//! print it:
//!
//! ```rust
+//! # extern crate sequoia_openpgp as openpgp;
//! # use openpgp::Result;
//! # use openpgp::Packet;
//! # use openpgp::parse::{PacketParserResult, PacketParser};
diff --git a/openpgp/src/packet_pile.rs b/openpgp/src/packet_pile.rs
index c670b8c0..bd3dd9f0 100644
--- a/openpgp/src/packet_pile.rs
+++ b/openpgp/src/packet_pile.rs
@@ -158,7 +158,7 @@ impl PacketPile {
/// # Example
///
/// ```rust
- /// # extern crate openpgp;
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::{Result, constants::{CompressionAlgorithm, DataFormat},
/// # Packet, PacketPile, packet::Literal, packet::CompressedData};
///
@@ -413,6 +413,7 @@ impl<'a> PacketParserBuilder<'a> {
/// # Examples
///
/// ```rust
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::Result;
/// # use openpgp::PacketPile;
/// # use openpgp::parse::{PacketParser, PacketParserBuilder};
diff --git a/openpgp/src/parse/map.rs b/openpgp/src/parse/map.rs
index 134d4f47..ed286977 100644
--- a/openpgp/src/parse/map.rs
+++ b/openpgp/src/parse/map.rs
@@ -56,6 +56,7 @@ impl Map {
/// # Example
///
/// ```
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::Result;
/// # use openpgp::parse::{PacketParser, PacketParserBuilder};
/// # f();
diff --git a/openpgp/src/parse/packet_parser_builder.rs b/openpgp/src/parse/packet_parser_builder.rs
index 73c20d8a..faec4765 100644
--- a/openpgp/src/parse/packet_parser_builder.rs
+++ b/openpgp/src/parse/packet_parser_builder.rs
@@ -107,6 +107,7 @@ impl<'a> PacketParserBuilder<'a> {
/// # Examples
///
/// ```rust
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::Result;
/// # use openpgp::parse::{
/// # PacketParserResult, PacketParser, PacketParserBuilder
diff --git a/openpgp/src/parse/packet_pile_parser.rs b/openpgp/src/parse/packet_pile_parser.rs
index c371bd60..fea99ae4 100644
--- a/openpgp/src/parse/packet_pile_parser.rs
+++ b/openpgp/src/parse/packet_pile_parser.rs
@@ -65,6 +65,7 @@ fn path_to(artifact: &str) -> PathBuf {
/// # Examples
///
/// ```rust
+/// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::Result;
/// # use openpgp::parse::PacketPileParser;
/// # let _ = f(include_bytes!("../../tests/data/messages/public-key.gpg"));
diff --git a/openpgp/src/parse/parse.rs b/openpgp/src/parse/parse.rs
index 7d26ba31..1dea32b5 100644
--- a/openpgp/src/parse/parse.rs
+++ b/openpgp/src/parse/parse.rs
@@ -2030,6 +2030,7 @@ impl PacketParserState {
/// Parse an OpenPGP message using a `PacketParser`:
///
/// ```rust
+/// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::Result;
/// # use openpgp::Packet;
/// # use openpgp::parse::{PacketParserResult, PacketParser};
@@ -2865,6 +2866,7 @@ impl <'a> PacketParser<'a> {
/// content is small.
///
/// ```rust
+ /// # extern crate sequoia_openpgp as openpgp;
/// # use openpgp::Result;
/// # use openpgp::Packet;
/// # use openpgp::parse::{PacketParserResult, PacketParser};
diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index 34934d49..83f94533 100644
--- a/