diff options
author | juga <juga@sequoia-pgp.org> | 2019-06-14 13:03:52 +0000 |
---|---|---|
committer | juga <juga@riseup.net> | 2019-06-19 09:27:43 +0000 |
commit | c80198c5a81daf6537d5ed0d3e9bed08003a5524 (patch) | |
tree | 42ebcb9cbd31fa167e65cd0c8529425291dd2acc | |
parent | 208d8bd28890493fecaf0d79a35c0a05bca77f46 (diff) |
net: Replace or remove comments
- comments that do not apply anymore.
- Closes #308.
- Bugfix 0.7.0.
-rw-r--r-- | net/src/wkd.rs | 1 | ||||
-rw-r--r-- | tool/src/sq.rs | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net/src/wkd.rs b/net/src/wkd.rs index f7ae0965..f8217731 100644 --- a/net/src/wkd.rs +++ b/net/src/wkd.rs @@ -271,7 +271,6 @@ mod tests { .unwrap(); let mut buffer: Vec<u8> = Vec::new(); tpk.serialize(&mut buffer).unwrap(); - // FIXME!!!! let valid_tpks = parse_body(&buffer, "juga@sequoia-pgp.org"); // The userid is not in the TPK assert!(valid_tpks.is_err()); diff --git a/tool/src/sq.rs b/tool/src/sq.rs index 9a611530..02233571 100644 --- a/tool/src/sq.rs +++ b/tool/src/sq.rs @@ -473,9 +473,13 @@ fn real_main() -> Result<(), failure::Error> { // Because it might be created a WkdServer struct, not // doing it for now. let tpks = wkd::get(&email_address)?; - // This is different to `store export` and `keyserver get`, - // Since the output is always bytes. - // XXX: Still give the possibility to write to a file. + // ```text + // The HTTP GET method MUST return the binary representation of the + // OpenPGP key for the given mail address. + // [draft-koch]: https://datatracker.ietf.org/doc/html/draft-koch-openpgp-webkey-service-07 + // ``` + // But to keep the parallelism with `store export` and `keyserver get`, + // The output is armored if not `--binary` option is given. let mut output = create_or_stdout(m.value_of("output"), force)?; let mut output = if ! m.is_present("binary") { Box::new(armor::Writer::new(&mut output, |