From 845c8c4b3d19f465ac144c8cf1d28cf190838ba1 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Mon, 13 Apr 2015 13:06:49 -0600 Subject: [PATCH] Change access modifiers to 'protected internal' (this is what I meant anyway by internal, didn't realize internal allowed any access in the assembly) --- TShockAPI/DB/UserManager.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs index 4d4388c4..8b7d0c64 100755 --- a/TShockAPI/DB/UserManager.cs +++ b/TShockAPI/DB/UserManager.cs @@ -368,7 +368,7 @@ namespace TShockAPI.DB /// Upgrades a password to BCrypt, from an insecure hashing algorithm. /// string password - the raw user password (unhashed) to upgrade - internal void upgradePasswordToBCrypt(string password) { + protected internal void upgradePasswordToBCrypt(string password) { // Save the old password, in the event that we have to revert changes. string oldpassword = this.Password; @@ -390,7 +390,7 @@ namespace TShockAPI.DB /// Upgrades a password to the highest work factor available in the config. /// string password - the raw user password (unhashed) to upgrade - internal void upgradePasswordWorkFactor(string password) { + protected internal void upgradePasswordWorkFactor(string password) { // If the destination work factor is not greater, we won't upgrade it or re-hash it int currentWorkFactor = Convert.ToInt32((this.Password.Split('$')[2])); @@ -423,7 +423,7 @@ namespace TShockAPI.DB /// /// A dictionary of hashing algortihms and an implementation object. /// - internal readonly Dictionary> HashTypes = new Dictionary> + protected internal readonly Dictionary> HashTypes = new Dictionary> { {"sha512", () => new SHA512Managed()}, {"sha256", () => new SHA256Managed()}, @@ -438,7 +438,7 @@ namespace TShockAPI.DB /// /// bytes to hash /// string hash - internal string hashPassword(byte[] bytes) + protected internal string hashPassword(byte[] bytes) { if (bytes == null) throw new NullReferenceException("bytes"); @@ -458,7 +458,7 @@ namespace TShockAPI.DB /// /// string to hash /// string hash - internal string hashPassword(string password) + protected internal string hashPassword(string password) { if (string.IsNullOrEmpty(password) || password == "non-existant password") return null;