summaryrefslogtreecommitdiffstats
path: root/openpgp/src/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'openpgp/src/crypto')
-rw-r--r--openpgp/src/crypto/aead.rs4
-rw-r--r--openpgp/src/crypto/hash.rs2
-rw-r--r--openpgp/src/crypto/s2k.rs2
-rw-r--r--openpgp/src/crypto/symmetric.rs2
4 files changed, 5 insertions, 5 deletions
diff --git a/openpgp/src/crypto/aead.rs b/openpgp/src/crypto/aead.rs
index 93e6ad5d..47501d60 100644
--- a/openpgp/src/crypto/aead.rs
+++ b/openpgp/src/crypto/aead.rs
@@ -204,7 +204,7 @@ impl<'a> Decryptor<'a> {
// Note: this implementation tries *very* hard to make sure we don't
// gratuitiously do a short read. Specifically, if the return value
// is less than `plaintext.len()`, then it is either because we
- // reached the end of the input or an error occured.
+ // reached the end of the input or an error occurred.
fn read_helper(&mut self, plaintext: &mut [u8]) -> Result<usize> {
use std::cmp::Ordering;
@@ -380,7 +380,7 @@ impl<'a> Decryptor<'a> {
// Note: this implementation tries *very* hard to make sure we don't
// gratuitiously do a short read. Specifically, if the return value
// is less than `plaintext.len()`, then it is either because we
-// reached the end of the input or an error occured.
+// reached the end of the input or an error occurred.
impl<'a> io::Read for Decryptor<'a> {
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
match self.read_helper(buf) {
diff --git a/openpgp/src/crypto/hash.rs b/openpgp/src/crypto/hash.rs
index cc5ea49d..d35394b9 100644
--- a/openpgp/src/crypto/hash.rs
+++ b/openpgp/src/crypto/hash.rs
@@ -83,7 +83,7 @@ impl HashAlgorithm {
}
}
- /// Creates a new Nettle hash context for this algorith.
+ /// Creates a new Nettle hash context for this algorithm.
///
/// # Errors
///
diff --git a/openpgp/src/crypto/s2k.rs b/openpgp/src/crypto/s2k.rs
index 44655613..2a819c47 100644
--- a/openpgp/src/crypto/s2k.rs
+++ b/openpgp/src/crypto/s2k.rs
@@ -74,7 +74,7 @@ impl Default for S2K {
}
impl S2K {
- /// Convert the string to a key using the S2K's paramters.
+ /// Convert the string to a key using the S2K's parameters.
pub fn derive_key(&self, string: &Password, key_size: usize)
-> Result<SessionKey> {
match self {
diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs
index 61c7dcd0..5ca999ad 100644
--- a/openpgp/src/crypto/symmetric.rs
+++ b/openpgp/src/crypto/symmetric.rs
@@ -194,7 +194,7 @@ fn read_exact<R: io::Read>(reader: &mut R, mut buffer: &mut [u8])
// Note: this implementation tries *very* hard to make sure we don't
// gratuitiously do a short read. Specifically, if the return value
// is less than `plaintext.len()`, then it is either because we
-// reached the end of the input or an error occured.
+// reached the end of the input or an error occurred.
impl<R: io::Read> io::Read for Decryptor<R> {
fn read(&mut self, plaintext: &mut [u8]) -> io::Result<usize> {
let mut pos = 0;