Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 23 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Cryptography/Constants.cs b/MediaBrowser.Model/Cryptography/Constants.cs
new file mode 100644
index 000000000..f2ebb5d3d
--- /dev/null
+++ b/MediaBrowser.Model/Cryptography/Constants.cs
@@ -0,0 +1,23 @@
+namespace MediaBrowser.Model.Cryptography
+{
+    /// <summary>
+    /// Class containing global constants for Jellyfin Cryptography.
+    /// </summary>
+    public static class Constants
+    {
+        /// <summary>
+        /// The default length for new salts.
+        /// </summary>
+        public const int DefaultSaltLength = 128 / 8;
+
+        /// <summary>
+        /// The default output length.
+        /// </summary>
+        public const int DefaultOutputLength = 512 / 8;
+
+        /// <summary>
+        /// The default amount of iterations for hashing passwords.
+        /// </summary>
+        public const int DefaultIterations = 120000;
+    }
+}