Merging upstream version 1.71.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 14 insertions, 8 deletions

diff --git a/vendor/orion/src/high_level/aead.rs b/vendor/orion/src/high_level/aead.rs
index 4ab5003c2..4159ef83b 100644
--- a/vendor/orion/src/high_level/aead.rs
+++ b/vendor/orion/src/high_level/aead.rs
@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2020-2022 The orion Developers
+// Copyright (c) 2020-2023 The orion Developers
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/orion/src/high_level/auth.rs b/vendor/orion/src/high_level/auth.rs
index e7957a7b3..7c61f9bd0 100644
--- a/vendor/orion/src/high_level/auth.rs
+++ b/vendor/orion/src/high_level/auth.rs
@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2020-2022 The orion Developers
+// Copyright (c) 2020-2023 The orion Developers
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/orion/src/high_level/hash.rs b/vendor/orion/src/high_level/hash.rs
index e51777354..78b4bda4c 100644
--- a/vendor/orion/src/high_level/hash.rs
+++ b/vendor/orion/src/high_level/hash.rs
@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2020-2022 The orion Developers
+// Copyright (c) 2020-2023 The orion Developers
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/orion/src/high_level/hltypes.rs b/vendor/orion/src/high_level/hltypes.rs
index 5e168f9a5..419cb2202 100644
--- a/vendor/orion/src/high_level/hltypes.rs
+++ b/vendor/orion/src/high_level/hltypes.rs
@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2020-2022 The orion Developers
+// Copyright (c) 2020-2023 The orion Developers
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/orion/src/high_level/kdf.rs b/vendor/orion/src/high_level/kdf.rs
index 9b39f9479..87f019200 100644
--- a/vendor/orion/src/high_level/kdf.rs
+++ b/vendor/orion/src/high_level/kdf.rs
@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2020-2022 The orion Developers
+// Copyright (c) 2020-2023 The orion Developers
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -58,6 +58,8 @@
 //! - The recommended minimum size for a salt is 16 bytes.
 //! - The recommended minimum size for a derived key is 16 bytes.
 //!
+//! If the concrete cost parameters needed are unclear, please refer to [OWASP] for recommended minimum values.
+//!
 //! # Example:
 //! ```rust
 //! use orion::kdf;
@@ -70,6 +72,7 @@
 //! # Ok::<(), orion::errors::UnknownCryptoError>(())
 //! ```
 //! [libsodium's docs]: https://download.libsodium.org/doc/password_hashing/default_phf#guidelines-for-choosing-the-parameters
+//! [OWASP]: https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html
 
 #![cfg_attr(docsrs, doc(cfg(feature = "safe_api")))]
 
diff --git a/vendor/orion/src/high_level/kex.rs b/vendor/orion/src/high_level/kex.rs
index 2d5a406f2..787f514a2 100644
--- a/vendor/orion/src/high_level/kex.rs
+++ b/vendor/orion/src/high_level/kex.rs
@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2021-2022 The orion Developers
+// Copyright (c) 2021-2023 The orion Developers
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/orion/src/high_level/mod.rs b/vendor/orion/src/high_level/mod.rs
index b7b573924..25080e8fc 100644
--- a/vendor/orion/src/high_level/mod.rs
+++ b/vendor/orion/src/high_level/mod.rs
@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2020-2022 The orion Developers
+// Copyright (c) 2020-2023 The orion Developers
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/orion/src/high_level/pwhash.rs b/vendor/orion/src/high_level/pwhash.rs
index dd8dbe087..3daee3917 100644
--- a/vendor/orion/src/high_level/pwhash.rs
+++ b/vendor/orion/src/high_level/pwhash.rs
@@ -1,6 +1,6 @@
 // MIT License
 
-// Copyright (c) 2020-2022 The orion Developers
+// Copyright (c) 2020-2023 The orion Developers
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -74,6 +74,8 @@
 //! - Choosing the correct cost parameters is important for security. Please refer to [libsodium's docs]
 //! for a description of how to do this.
 //!
+//! If the concrete cost parameters needed are unclear, please refer to [OWASP] for recommended minimum values.
+//!
 //! # Example:
 //! ```rust
 //! use orion::pwhash;
@@ -86,6 +88,7 @@
 //! ```
 //! [encoding format here]: https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md
 //! [libsodium's docs]: https://download.libsodium.org/doc/password_hashing/default_phf#guidelines-for-choosing-the-parameters
+//! [OWASP]: https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html
 
 #![cfg_attr(docsrs, doc(cfg(feature = "safe_api")))]