Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e1d9219

Browse files
tarcieritarcieri
committedSep 18, 2019
ghash: Split from polyval crate
This extracts `ghash` into its own crate. In attempting to add runtime detection to `polyval`, having `ghash` in the same crate felt in-the-way. In this commit, I have split the two crates in advance, and then I'll rebase my runtime detection into its own commit. I think we only need two crates here, as the `ghash` crate is implemented in terms of POLYVAL's field/polynomial: `GHASH(H, X_1, ..., X_n)` => `ByteReverse(POLYVAL(mulX_POLYVAL(ByteReverse(H)), ByteReverse(X_1), ..., ByteReverse(X_n)))` Though they are both GF(2^128), there are some slight discrepancies in the field arithmetic owing to the polynomial, and this approach leverages the fact that the POLYVAL polynomial is the "reverse" of the GHASH one.
1 parent 8a1d1af commit e1d9219

File tree

14 files changed

+405
-58
lines changed

14 files changed

+405
-58
lines changed
 

‎Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[workspace]
22
members = [
3+
"ghash",
34
"poly1305",
45
"polyval"
56
]

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ security reviews.
1313
## Crates
1414
| Name | Crates.io | Documentation |
1515
| ---- | :--------:| :------------:|
16+
| `ghash` | [![crates.io](https://img.shields.io/crates/v/ghash.svg)](https://crates.io/crates/ghash) | [![Documentation](https://docs.rs/ghash/badge.svg)](https://docs.rs/ghash) |
1617
| `poly1305` | [![crates.io](https://img.shields.io/crates/v/poly1305.svg)](https://crates.io/crates/poly1305) | [![Documentation](https://docs.rs/poly1305/badge.svg)](https://docs.rs/poly1305) |
17-
| `polyval` | [![crates.io](https://img.shields.io/crates/v/polyval.svg)](https://crates.io/crates/poly1305) | [![Documentation](https://docs.rs/polyval/badge.svg)](https://docs.rs/polyval) |
18+
| `polyval` | [![crates.io](https://img.shields.io/crates/v/polyval.svg)](https://crates.io/crates/polyval) | [![Documentation](https://docs.rs/polyval/badge.svg)](https://docs.rs/polyval) |
1819

1920
### Minimum Supported Rust Version
2021
All crates in this repository support Rust 1.34 or higher. In future minimum

‎ghash/CHANGES.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

‎ghash/Cargo.toml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[package]
2+
name = "ghash"
3+
version = "0.0.0"
4+
authors = ["RustCrypto Developers"]
5+
license = "MIT OR Apache-2.0"
6+
description = """
7+
Universal hash over GF(2^128) useful for constructing a Message Authentication Code (MAC),
8+
as in the AES-GCM authenticated encryption cipher.
9+
"""
10+
documentation = "https://docs.rs/ghash"
11+
repository = "https://github.com/RustCrypto/universal-hashes"
12+
readme = "README.md"
13+
keywords = ["aes-gcm", "crypto", "universal-hashing"]
14+
categories = ["cryptography", "no-std"]
15+
edition = "2018"
16+
17+
[dependencies]
18+
polyval = { version = "0.0.1", path = "../polyval" }
19+
20+
[dev-dependencies]
21+
hex-literal = "0.1"
22+
23+
[features]
24+
std = ["polyval/std"]
25+
26+
[badges]
27+
maintenance = { status = "experimental" }
28+
travis-ci = { repository = "RustCrypto/universal-hashes" }

‎ghash/LICENSE-APACHE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎ghash/LICENSE-MIT

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Copyright (c) 2019 RustCrypto Developers
2+
3+
Permission is hereby granted, free of charge, to any
4+
person obtaining a copy of this software and associated
5+
documentation files (the "Software"), to deal in the
6+
Software without restriction, including without
7+
limitation the rights to use, copy, modify, merge,
8+
publish, distribute, sublicense, and/or sell copies of
9+
the Software, and to permit persons to whom the Software
10+
is furnished to do so, subject to the following
11+
conditions:
12+
13+
The above copyright notice and this permission notice
14+
shall be included in all copies or substantial portions
15+
of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
18+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
19+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
20+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
21+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
22+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
23+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
24+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25+
DEALINGS IN THE SOFTWARE.

‎ghash/README.md

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# GHASH: fast universal hash function and MAC
2+
3+
[![crate][crate-image]][crate-link]
4+
[![Docs][docs-image]][docs-link]
5+
![Apache2/MIT licensed][license-image]
6+
![Rust Version][rustc-image]
7+
![Maintenance Status: Experimental][maintenance-image]
8+
[![Build Status][build-image]][build-link]
9+
10+
[GHASH][1] is a [universal hash function][2] which operates over GF(2^128) and
11+
can be used for constructing a [Message Authentication Code (MAC)][3].
12+
13+
Its primary intended use is for implementing [AES-GCM][4].
14+
15+
[Documentation][docs-link]
16+
17+
## Security Warning
18+
19+
No security audits of this crate have ever been performed, and it has not been
20+
thoroughly assessed to ensure its operation is constant-time on common CPU
21+
architectures.
22+
23+
USE AT YOUR OWN RISK!
24+
25+
## License
26+
27+
Licensed under either of:
28+
29+
* [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
30+
* [MIT license](http://opensource.org/licenses/MIT)
31+
32+
at your option.
33+
34+
### Contribution
35+
36+
Unless you explicitly state otherwise, any contribution intentionally submitted
37+
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
38+
dual licensed as above, without any additional terms or conditions.
39+
40+
[//]: # (badges)
41+
42+
[crate-image]: https://img.shields.io/crates/v/ghash.svg
43+
[crate-link]: https://crates.io/crates/ghash
44+
[docs-image]: https://docs.rs/ghash/badge.svg
45+
[docs-link]: https://docs.rs/ghash/
46+
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
47+
[rustc-image]: https://img.shields.io/badge/rustc-1.34+-blue.svg
48+
[maintenance-image]: https://img.shields.io/badge/maintenance-experimental-blue.svg
49+
[build-image]: https://travis-ci.com/RustCrypto/universal-hashes.svg?branch=master
50+
[build-link]: https://travis-ci.com/RustCrypto/universal-hashes
51+
52+
[//]: # (general links)
53+
54+
[1]: https://en.wikipedia.org/wiki/Galois/Counter_Mode#Mathematical_basis
55+
[2]: https://en.wikipedia.org/wiki/Universal_hashing
56+
[3]: https://en.wikipedia.org/wiki/Message_authentication_code
57+
[4]: https://en.wikipedia.org/wiki/Galois/Counter_Mode

‎ghash/benches/polyval.rs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#![feature(test)]
2+
3+
extern crate test;
4+
5+
use polyval::{universal_hash::UniversalHash, Polyval};
6+
use test::Bencher;
7+
8+
// TODO(tarcieri): move this into the `universal-hash` crate
9+
macro_rules! bench {
10+
($name:ident, $bs:expr) => {
11+
#[bench]
12+
fn $name(b: &mut Bencher) {
13+
let key = Default::default();
14+
let mut m = Polyval::new(&key);
15+
let data = [0; $bs];
16+
17+
b.iter(|| {
18+
m.update_padded(&data);
19+
});
20+
21+
b.bytes = $bs;
22+
}
23+
};
24+
}
25+
26+
bench!(bench1_10, 10);
27+
bench!(bench2_100, 100);
28+
bench!(bench3_1000, 1000);
29+
bench!(bench3_10000, 10000);

‎polyval/src/ghash.rs ‎ghash/src/lib.rs

+30-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
//! **GHASH**: universal hash over GF(2^128) used by AES-GCM.
22
3-
use crate::{
4-
field::{backend::U64x2, Block},
5-
Polyval,
6-
};
3+
#![no_std]
4+
#![doc(html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
5+
#![warn(missing_docs, rust_2018_idioms)]
6+
7+
pub use polyval::universal_hash;
8+
9+
use core::convert::TryInto;
10+
use polyval::{field::Block, Polyval};
711
use universal_hash::generic_array::{typenum::U16, GenericArray};
812
use universal_hash::{Output, UniversalHash};
913

@@ -20,7 +24,6 @@ use universal_hash::{Output, UniversalHash};
2024
/// > irreducible polynomials: POLYVAL works modulo x^128 + x^127 + x^126 +
2125
/// > x^121 + 1 and GHASH works modulo x^128 + x^7 + x^2 + x + 1. Note
2226
/// > that these irreducible polynomials are the "reverse" of each other.
23-
#[allow(non_snake_case)]
2427
#[derive(Clone)]
2528
#[repr(align(16))]
2629
pub struct GHash(Polyval);
@@ -33,9 +36,7 @@ impl UniversalHash for GHash {
3336
fn new(h: &GenericArray<u8, U16>) -> Self {
3437
let mut h: Block = h.clone().into();
3538
h.reverse();
36-
37-
let h_polyval: Block = U64x2::from(h).mulx().into();
38-
GHash(Polyval::new(&h_polyval.into()))
39+
GHash(Polyval::new(&mulX_POLYVAL(h).into()))
3940
}
4041

4142
/// Input a field element `X` to be authenticated
@@ -57,3 +58,24 @@ impl UniversalHash for GHash {
5758
Output::new(output.into())
5859
}
5960
}
61+
62+
/// The `mulX_POLYVAL()` function as defined in [RFC 8452 Appendix A][1].
63+
/// Performs a doubling (a.k.a. "multiply by x") over GF(2^128).
64+
/// This is useful for implementing GHASH in terms of POLYVAL.
65+
///
66+
/// [1]: https://tools.ietf.org/html/rfc8452#appendix-A
67+
#[allow(non_snake_case)]
68+
fn mulX_POLYVAL(block: Block) -> Block {
69+
let mut v0 = u64::from_le_bytes(block[..8].try_into().unwrap());
70+
let mut v1 = u64::from_le_bytes(block[8..].try_into().unwrap());
71+
72+
let v0h = v0 >> 63;
73+
let v1h = v1 >> 63;
74+
75+
v0 <<= 1;
76+
v1 <<= 1;
77+
v0 ^= v1h;
78+
v1 ^= v0h ^ (v1h << 63) ^ (v1h << 62) ^ (v1h << 57);
79+
80+
(u128::from(v0) | (u128::from(v1) << 64)).to_le_bytes()
81+
}

‎ghash/tests/lib.rs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#[macro_use]
2+
extern crate hex_literal;
3+
4+
use ghash::{universal_hash::UniversalHash, GHash};
5+
6+
//
7+
// Test vectors for GHASH from RFC 8452 Appendix A
8+
// <https://tools.ietf.org/html/rfc8452#appendix-A>
9+
//
10+
11+
const H: [u8; 16] = hex!("25629347589242761d31f826ba4b757b");
12+
const X_1: [u8; 16] = hex!("4f4f95668c83dfb6401762bb2d01a262");
13+
const X_2: [u8; 16] = hex!("d1a24ddd2721d006bbe45f20d3c9f362");
14+
15+
/// GHASH(H, X_1, X_2)
16+
const GHASH_RESULT: [u8; 16] = hex!("bd9b3997046731fb96251b91f9c99d7a");
17+
18+
#[test]
19+
fn ghash_test_vector() {
20+
let mut ghash = GHash::new(&H.into());
21+
ghash.update_block(&X_1.into());
22+
ghash.update_block(&X_2.into());
23+
24+
let result = ghash.result();
25+
assert_eq!(&GHASH_RESULT[..], result.into_bytes().as_slice());
26+
}

‎polyval/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ zeroize = { version = "0.10", optional = true, default-features = false }
2222
hex-literal = "0.1"
2323

2424
[features]
25-
ghash = []
2625
std = ["universal-hash/std"]
2726

2827
[badges]
2928
maintenance = { status = "experimental" }
3029
travis-ci = { repository = "RustCrypto/universal-hashes" }
31-
32-
[package.metadata.docs.rs]
33-
all-features = true

‎polyval/src/field/backend/soft.rs

-21
Original file line numberDiff line numberDiff line change
@@ -113,27 +113,6 @@ impl Mul for U64x2 {
113113
}
114114
}
115115

116-
impl U64x2 {
117-
/// The `mulX_POLYVAL()` function as defined in [RFC 8452 Appendix A][1].
118-
/// Performs a doubling (a.k.a. "multiply by x") over GF(2^128).
119-
/// This is useful for implementing GHASH in terms of POLYVAL.
120-
///
121-
/// [1]: https://tools.ietf.org/html/rfc8452#appendix-A
122-
pub fn mulx(self) -> Self {
123-
let mut v0 = self.0;
124-
let mut v1 = self.1;
125-
let v0h = v0 >> 63;
126-
let v1h = v1 >> 63;
127-
128-
v0 <<= 1;
129-
v1 <<= 1;
130-
v0 ^= v1h;
131-
v1 ^= v0h ^ (v1h << 63) ^ (v1h << 62) ^ (v1h << 57);
132-
133-
U64x2(v0, v1)
134-
}
135-
}
136-
137116
/// Reverse a `u64` in constant time
138117
fn rev64(mut x: u64) -> u64 {
139118
x = ((x & 0x5555_5555_5555_5555) << 1) | ((x >> 1) & 0x5555_5555_5555_5555);

‎polyval/src/lib.rs

-7
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
//!
2424
//! ## Relationship to GHASH
2525
//!
26-
//! This crate also provides an implementation of **GHASH** gated under the
27-
//! `ghash` cargo feature and the [`GHash`] type.
28-
//!
2926
//! POLYVAL can be thought of as the little endian equivalent of GHASH, which
3027
//! affords it a small performance advantage over GHASH when used on little
3128
//! endian architectures.
@@ -50,11 +47,7 @@
5047
#![warn(missing_docs, rust_2018_idioms)]
5148

5249
pub mod field;
53-
#[cfg(feature = "ghash")]
54-
mod ghash;
5550

56-
#[cfg(feature = "ghash")]
57-
pub use self::ghash::GHash;
5851
pub use universal_hash;
5952

6053
use universal_hash::generic_array::{typenum::U16, GenericArray};

‎polyval/tests/lib.rs

-17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#[macro_use]
22
extern crate hex_literal;
33

4-
#[cfg(feature = "ghash")]
5-
use polyval::GHash;
64
use polyval::{universal_hash::UniversalHash, Polyval};
75

86
//
@@ -17,10 +15,6 @@ const X_2: [u8; 16] = hex!("d1a24ddd2721d006bbe45f20d3c9f362");
1715
/// POLYVAL(H, X_1, X_2)
1816
const POLYVAL_RESULT: [u8; 16] = hex!("f7a3b47b846119fae5b7866cf5e5b77e");
1917

20-
/// GHASH(H, X_1, X_2)
21-
#[cfg(feature = "ghash")]
22-
const GHASH_RESULT: [u8; 16] = hex!("bd9b3997046731fb96251b91f9c99d7a");
23-
2418
#[test]
2519
fn polyval_test_vector() {
2620
let mut poly = Polyval::new(&H.into());
@@ -30,14 +24,3 @@ fn polyval_test_vector() {
3024
let result = poly.result();
3125
assert_eq!(&POLYVAL_RESULT[..], result.into_bytes().as_slice());
3226
}
33-
34-
#[cfg(feature = "ghash")]
35-
#[test]
36-
fn ghash_test_vector() {
37-
let mut ghash = GHash::new(&H.into());
38-
ghash.update_block(&X_1.into());
39-
ghash.update_block(&X_2.into());
40-
41-
let result = ghash.result();
42-
assert_eq!(&GHASH_RESULT[..], result.into_bytes().as_slice());
43-
}

0 commit comments

Comments
 (0)
Please sign in to comment.