diff --git a/Lib/Security.Cryptography.dll b/Lib/Security.Cryptography.dll deleted file mode 100644 index d19198541..000000000 Binary files a/Lib/Security.Cryptography.dll and /dev/null differ diff --git a/Licenses/CLR_Security_license.txt b/Licenses/CLR_Security_license.txt deleted file mode 100644 index af3fff347..000000000 --- a/Licenses/CLR_Security_license.txt +++ /dev/null @@ -1,33 +0,0 @@ -Microsoft Limited Permissive License (Ms-LPL) - -This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software. - -1. Definitions - -The terms “reproduce,” “reproduction,” “derivative works,” and “distribution” have the same meaning here as under U.S. copyright law. - -A “contribution” is the original software, or any additions or changes to the software. - -A “contributor” is any person that distributes its contribution under this license. - -“Licensed patents” are a contributor’s patent claims that read directly on its contribution. - -2. Grant of Rights - -(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. - -(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. - -3. Conditions and Limitations - -(A) No Trademark License- This license does not grant you rights to use any contributors’ name, logo, or trademarks. - -(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically. - -(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software. - -(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license. - -(E) The software is licensed “as-is.” You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement. - -(F) Platform Limitation- The licenses granted in sections 2(A) & 2(B) extend only to the software or derivative works that you create that run on a Microsoft Windows operating system product. \ No newline at end of file diff --git a/ShareX.UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs index 1321b4d2f..34df8aa12 100644 --- a/ShareX.UploadersLib/Enums.cs +++ b/ShareX.UploadersLib/Enums.cs @@ -130,8 +130,6 @@ public enum FileDestination Uguu, [Description("Dropfile")] Dropfile, - [Description("Up1")] - Up1, [Description("Seafile")] Seafile, [Description("Streamable")] diff --git a/ShareX.UploadersLib/Favicons/Up1.ico b/ShareX.UploadersLib/Favicons/Up1.ico deleted file mode 100644 index 1b19b722b..000000000 Binary files a/ShareX.UploadersLib/Favicons/Up1.ico and /dev/null differ diff --git a/ShareX.UploadersLib/FileUploaders/Up1.cs b/ShareX.UploadersLib/FileUploaders/Up1.cs deleted file mode 100644 index a76943031..000000000 --- a/ShareX.UploadersLib/FileUploaders/Up1.cs +++ /dev/null @@ -1,241 +0,0 @@ -#region License Information (GPL v3) - -/* - ShareX - A program that allows you to take screenshots and share any file type - Copyright (c) 2007-2016 ShareX Team - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Optionally you can also view the license at . -*/ - -#endregion License Information (GPL v3) - -// Credits: https://github.com/Upload - -using Newtonsoft.Json; -using Security.Cryptography; -using ShareX.HelpersLib; -using ShareX.UploadersLib.Properties; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using System.Windows.Forms; - -namespace ShareX.UploadersLib.FileUploaders -{ - public class Up1FileUploaderService : FileUploaderService - { - public override FileDestination EnumValue { get; } = FileDestination.Up1; - - public override Icon ServiceIcon => Resources.Up1; - - public override bool CheckConfig(UploadersConfig config) => true; - - public override GenericUploader CreateUploader(UploadersConfig config, TaskReferenceHelper taskInfo) - { - return new Up1(config.Up1Host, config.Up1Key); - } - - public override TabPage GetUploadersConfigTabPage(UploadersConfigForm form) => form.tpUp1; - } - - public sealed class Up1 : FileUploader - { - /* - * Up1 is an encrypted image uploader. The idea is that any URL (for example, https://up1.ca/#hsd2mdSuIkzTUR6saZpn1Q) contains - * what is called a "seed". In this case, the seed is "hsd2mdSuIkzTUR6saZpn1Q". With this, we use sha512(seed) (output 64 bytes) - * in order to derive an AES key (32 bytes), a CCM IV (16 bytes), and a server-side identifier (16 bytes). These are used to - * encrypt and store the data. - * - * Within the encrypted blob, There is a double-null-terminated UTF-16 JSON object that contains metadata like the filename and mimetype. - * This is prepended to the image data. - */ - - private const int MacSize = 64; - - public string SystemUrl { get; set; } - public string ApiKey { get; set; } - - public Up1(string systemUrl, string apiKey) - { - if (string.IsNullOrEmpty(systemUrl)) - { - SystemUrl = "https://up1.ca"; - } - else - { - SystemUrl = systemUrl; - } - - if (string.IsNullOrEmpty(apiKey)) - { - ApiKey = "c61540b5ceecd05092799f936e27755f"; - } - else - { - ApiKey = apiKey; - } - } - - /* Since we're dealing with URLs, the regular base64 encoding using +, / and = will mess things up - * Therefore we'll use the URL base64 standard (as defined in the RFC) - */ - - private static string UrlBase64Encode(byte[] input) - { - return Convert.ToBase64String(input).Replace("=", "").Replace("+", "-").Replace("/", "_"); - } - - /* SJCL (the Javascript library powering the crypto in the browser) depends on the length of the input - * in order to calculate CCM's IV length. This is the algorithm it uses. - */ - - private static long FindIVLen(long bufferLength) - { - if (bufferLength < 0xFFFF) return 15 - 2; - if (bufferLength < 0xFFFFFF) return 15 - 3; - return 15 - 4; - } - - /* Given an input seed, derive the required output. - */ - - private static void DeriveParams(byte[] seed, out byte[] key, out byte[] iv, out string ident) - { - // Hash the output using sha512 - byte[] seed_output; - - using (SHA512CryptoServiceProvider sha512csp = new SHA512CryptoServiceProvider()) - { - seed_output = sha512csp.ComputeHash(seed); - } - - // Take key from first 32 bytes - key = new byte[32]; - Buffer.BlockCopy(seed_output, 0, key, 0, 32); - - // Take IV from next 16 bytes - iv = new byte[16]; - Buffer.BlockCopy(seed_output, 32, iv, 0, 16); - - // Take server identifier (the "ident") from last 16 bytes and base64url encode it - byte[] ident_raw = new byte[16]; - Buffer.BlockCopy(seed_output, 48, ident_raw, 0, 16); - ident = UrlBase64Encode(ident_raw); - } - - private static MemoryStream Encrypt(Stream source, string fileName, out string seed_encoded, out string ident) - { - // Randomly generate a new seed for upload - byte[] seed = new byte[16]; - - using (RNGCryptoServiceProvider rngCsp = new RNGCryptoServiceProvider()) - { - rngCsp.GetBytes(seed); - } - - seed_encoded = UrlBase64Encode(seed); - - // Derive the parameters (key, IV, ident) from the seed - byte[] key, iv; - DeriveParams(seed, out key, out iv, out ident); - - // Create a new String->String map for JSON blob, and define filename and metadata - Dictionary metadataMap = new Dictionary(); - metadataMap["mime"] = Helpers.IsTextFile(fileName) ? "text/plain" : Helpers.GetMimeType(fileName); - metadataMap["name"] = fileName; - - // Encode the metadata with UTF-16 and a double-null-byte terminator, and append data - // Unfortunately, the CCM cipher mode can't stream the encryption, and so we have to GetBytes() on the source. - // We do limit the source to 50MB however - byte[] data = Encoding.BigEndianUnicode.GetBytes(JsonConvert.SerializeObject(metadataMap)).Concat(new byte[] { 0, 0 }).Concat(source.GetBytes()).ToArray(); - - // Calculate the length of the CCM IV and copy it over - long ccmIVLen = FindIVLen(data.Length); - byte[] ccmIV = new byte[ccmIVLen]; - Array.Copy(iv, ccmIV, ccmIVLen); - - // http://blogs.msdn.com/b/shawnfa/archive/2009/03/17/authenticated-symmetric-encryption-in-net.aspx - using (AuthenticatedAesCng aes = new AuthenticatedAesCng()) - { - aes.CngMode = CngChainingMode.Ccm; - aes.Key = key; - aes.IV = ccmIV; - aes.TagSize = MacSize; - - MemoryStream ms = new MemoryStream(); - - using (IAuthenticatedCryptoTransform encryptor = aes.CreateAuthenticatedEncryptor()) - { - CryptoStream cs = new CryptoStream(ms, encryptor, CryptoStreamMode.Write); - cs.Write(data, 0, data.Length); - cs.FlushFinalBlock(); - byte[] tag = encryptor.GetTag(); - ms.Write(tag, 0, tag.Length); - return ms; - } - } - } - - public override UploadResult Upload(Stream input, string fileName) - { - // Make sure the file (or memory stream) is less than 50MB - if (input.Length > 50000000) - { - throw new ArgumentException("Input files for Up1 cannot be more than 50MB in size."); - } - - // Initialize the encrypted stream - UploadResult result; - string seed, ident; - - using (MemoryStream encryptedStream = Encrypt(input, fileName, out seed, out ident)) - { - // Set up the form upload - Dictionary uploadArgs = new Dictionary(); - uploadArgs["ident"] = ident; - uploadArgs["api_key"] = ApiKey; - - // Upload and stream encrypt - result = UploadData(encryptedStream, URLHelpers.CombineURL(SystemUrl, "up"), "blob", "file", uploadArgs); - } - - if (result.IsSuccess) - { - // Return the output URLs - result.URL = URLHelpers.CombineURL(SystemUrl, "#" + seed); - - Up1Response response = JsonConvert.DeserializeObject(result.Response); - - if (response != null) - { - result.DeletionURL = URLHelpers.CombineURL(SystemUrl, string.Format("del?ident={0}&delkey={1}", ident, response.DelKey)); - } - } - - return result; - } - - private class Up1Response - { - public string DelKey { get; set; } - } - } -} \ No newline at end of file diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs index e055996ab..e979b3a7c 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -248,6 +248,7 @@ private void InitializeComponent() this.txtMegaPassword = new System.Windows.Forms.TextBox(); this.lblMegaPassword = new System.Windows.Forms.Label(); this.tpOwnCloud = new System.Windows.Forms.TabPage(); + this.lblOwnCloudHostExample = new System.Windows.Forms.Label(); this.cbOwnCloud81Compatibility = new System.Windows.Forms.CheckBox(); this.cbOwnCloudDirectLink = new System.Windows.Forms.CheckBox(); this.cbOwnCloudCreateShare = new System.Windows.Forms.CheckBox(); @@ -332,11 +333,6 @@ private void InitializeComponent() this.lblPomfUploadURL = new System.Windows.Forms.Label(); this.lblPomfUploaders = new System.Windows.Forms.Label(); this.cbPomfUploaders = new System.Windows.Forms.ComboBox(); - this.tpUp1 = new System.Windows.Forms.TabPage(); - this.txtUp1Key = new System.Windows.Forms.TextBox(); - this.txtUp1Host = new System.Windows.Forms.TextBox(); - this.lblUp1Key = new System.Windows.Forms.Label(); - this.lblUp1Host = new System.Windows.Forms.Label(); this.tpSeafile = new System.Windows.Forms.TabPage(); this.cbSeafileAPIURL = new System.Windows.Forms.ComboBox(); this.grpSeafileShareSettings = new System.Windows.Forms.GroupBox(); @@ -549,7 +545,6 @@ private void InitializeComponent() this.lblWidthHint = new System.Windows.Forms.Label(); this.ttlvMain = new ShareX.HelpersLib.TabToListView(); this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl(); - this.lblOwnCloudHostExample = new System.Windows.Forms.Label(); this.tpOtherUploaders.SuspendLayout(); this.tcOtherUploaders.SuspendLayout(); this.tpTwitter.SuspendLayout(); @@ -595,7 +590,6 @@ private void InitializeComponent() this.gpJiraServer.SuspendLayout(); this.tpLambda.SuspendLayout(); this.tpPomf.SuspendLayout(); - this.tpUp1.SuspendLayout(); this.tpSeafile.SuspendLayout(); this.grpSeafileShareSettings.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudSeafileExpireDays)).BeginInit(); @@ -1640,7 +1634,6 @@ private void InitializeComponent() this.tcFileUploaders.Controls.Add(this.tpJira); this.tcFileUploaders.Controls.Add(this.tpLambda); this.tcFileUploaders.Controls.Add(this.tpPomf); - this.tcFileUploaders.Controls.Add(this.tpUp1); this.tcFileUploaders.Controls.Add(this.tpSeafile); this.tcFileUploaders.Controls.Add(this.tpStreamable); this.tcFileUploaders.Controls.Add(this.tpSul); @@ -2269,6 +2262,11 @@ private void InitializeComponent() this.tpOwnCloud.Name = "tpOwnCloud"; this.tpOwnCloud.UseVisualStyleBackColor = true; // + // lblOwnCloudHostExample + // + resources.ApplyResources(this.lblOwnCloudHostExample, "lblOwnCloudHostExample"); + this.lblOwnCloudHostExample.Name = "lblOwnCloudHostExample"; + // // cbOwnCloud81Compatibility // resources.ApplyResources(this.cbOwnCloud81Compatibility, "cbOwnCloud81Compatibility"); @@ -2842,38 +2840,6 @@ private void InitializeComponent() this.cbPomfUploaders.Name = "cbPomfUploaders"; this.cbPomfUploaders.SelectedIndexChanged += new System.EventHandler(this.cbPomfUploaders_SelectedIndexChanged); // - // tpUp1 - // - this.tpUp1.Controls.Add(this.txtUp1Key); - this.tpUp1.Controls.Add(this.txtUp1Host); - this.tpUp1.Controls.Add(this.lblUp1Key); - this.tpUp1.Controls.Add(this.lblUp1Host); - resources.ApplyResources(this.tpUp1, "tpUp1"); - this.tpUp1.Name = "tpUp1"; - this.tpUp1.UseVisualStyleBackColor = true; - // - // txtUp1Key - // - resources.ApplyResources(this.txtUp1Key, "txtUp1Key"); - this.txtUp1Key.Name = "txtUp1Key"; - this.txtUp1Key.TextChanged += new System.EventHandler(this.txtUp1Key_TextChanged); - // - // txtUp1Host - // - resources.ApplyResources(this.txtUp1Host, "txtUp1Host"); - this.txtUp1Host.Name = "txtUp1Host"; - this.txtUp1Host.TextChanged += new System.EventHandler(this.txtUp1Host_TextChanged); - // - // lblUp1Key - // - resources.ApplyResources(this.lblUp1Key, "lblUp1Key"); - this.lblUp1Key.Name = "lblUp1Key"; - // - // lblUp1Host - // - resources.ApplyResources(this.lblUp1Host, "lblUp1Host"); - this.lblUp1Host.Name = "lblUp1Host"; - // // tpSeafile // this.tpSeafile.Controls.Add(this.cbSeafileAPIURL); @@ -4411,11 +4377,6 @@ private void InitializeComponent() this.actRapidShareAccountType.Name = "actRapidShareAccountType"; this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; // - // lblOwnCloudHostExample - // - resources.ApplyResources(this.lblOwnCloudHostExample, "lblOwnCloudHostExample"); - this.lblOwnCloudHostExample.Name = "lblOwnCloudHostExample"; - // // UploadersConfigForm // resources.ApplyResources(this, "$this"); @@ -4507,8 +4468,6 @@ private void InitializeComponent() this.tpLambda.PerformLayout(); this.tpPomf.ResumeLayout(false); this.tpPomf.PerformLayout(); - this.tpUp1.ResumeLayout(false); - this.tpUp1.PerformLayout(); this.tpSeafile.ResumeLayout(false); this.tpSeafile.PerformLayout(); this.grpSeafileShareSettings.ResumeLayout(false); @@ -4918,10 +4877,6 @@ private void InitializeComponent() private System.Windows.Forms.Label lblTwitterDefaultMessage; private System.Windows.Forms.TextBox txtTwitterDefaultMessage; private System.Windows.Forms.CheckBox cbTwitterSkipMessageBox; - private System.Windows.Forms.TextBox txtUp1Key; - private System.Windows.Forms.TextBox txtUp1Host; - private System.Windows.Forms.Label lblUp1Key; - private System.Windows.Forms.Label lblUp1Host; private System.Windows.Forms.TextBox txtCoinURLUUID; private System.Windows.Forms.Label lblCoinURLUUID; private System.Windows.Forms.CheckBox cbOwnCloud81Compatibility; @@ -5063,7 +5018,6 @@ private void InitializeComponent() public System.Windows.Forms.TabPage tpLambda; public System.Windows.Forms.TabPage tpLithiio; public System.Windows.Forms.TabPage tpPomf; - public System.Windows.Forms.TabPage tpUp1; public System.Windows.Forms.TabPage tpSeafile; public System.Windows.Forms.TabPage tpSul; public System.Windows.Forms.TabPage tpStreamable; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 543c16476..0393704c5 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -536,11 +536,6 @@ public void LoadSettings() txtMediaFirePath.Text = Config.MediaFirePath; cbMediaFireUseLongLink.Checked = Config.MediaFireUseLongLink; - // Up1 - - txtUp1Host.Text = Config.Up1Host; - txtUp1Key.Text = Config.Up1Key; - // Lambda txtLambdaApiKey.Text = Config.LambdaSettings.UserAPIKey; @@ -2035,20 +2030,6 @@ private void cbOwnCloud81Compatibility_CheckedChanged(object sender, EventArgs e #endregion ownCloud - #region Up1 - - private void txtUp1Host_TextChanged(object sender, EventArgs e) - { - Config.Up1Host = txtUp1Host.Text; - } - - private void txtUp1Key_TextChanged(object sender, EventArgs e) - { - Config.Up1Key = txtUp1Key.Text; - } - - #endregion Up1 - #region Pushbullet private void txtPushbulletUserKey_TextChanged(object sender, EventArgs e) diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index 109ca432f..225d0a184 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -7920,147 +7920,6 @@ store.book[0].title 17 - - 16, 96 - - - 4, 5, 4, 5 - - - 370, 20 - - - 9 - - - txtUp1Key - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUp1 - - - 0 - - - 16, 40 - - - 4, 5, 4, 5 - - - 370, 20 - - - 8 - - - txtUp1Host - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUp1 - - - 1 - - - True - - - NoControl - - - 13, 72 - - - 4, 0, 4, 0 - - - 47, 13 - - - 7 - - - API key: - - - lblUp1Key - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUp1 - - - 2 - - - True - - - NoControl - - - 13, 16 - - - 4, 0, 4, 0 - - - 32, 13 - - - 6 - - - Host: - - - lblUp1Host - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUp1 - - - 3 - - - 4, 40 - - - 3, 3, 3, 3 - - - 972, 475 - - - 21 - - - Up1 - - - tpUp1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcFileUploaders - - - 18 - https://seacloud.cc/api2/ @@ -9020,7 +8879,7 @@ Using an encrypted library disables sharing. tcFileUploaders - 19 + 18 True @@ -9221,7 +9080,7 @@ Using an encrypted library disables sharing. tcFileUploaders - 20 + 19 16, 32 @@ -9299,7 +9158,7 @@ Using an encrypted library disables sharing. tcFileUploaders - 21 + 20 NoControl @@ -9455,7 +9314,7 @@ Using an encrypted library disables sharing. tcFileUploaders - 22 + 21 True @@ -9662,7 +9521,7 @@ Using an encrypted library disables sharing. tcFileUploaders - 23 + 22 16, 408 @@ -10082,7 +9941,7 @@ Using an encrypted library disables sharing. tcFileUploaders - 24 + 23 Fill diff --git a/ShareX.UploadersLib/Properties/Resources.Designer.cs b/ShareX.UploadersLib/Properties/Resources.Designer.cs index 966c9fa0e..a03659126 100644 --- a/ShareX.UploadersLib/Properties/Resources.Designer.cs +++ b/ShareX.UploadersLib/Properties/Resources.Designer.cs @@ -627,16 +627,6 @@ internal class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Up1 { - get { - object obj = ResourceManager.GetObject("Up1", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// diff --git a/ShareX.UploadersLib/Properties/Resources.resx b/ShareX.UploadersLib/Properties/Resources.resx index b8b826453..b6864a9ec 100644 --- a/ShareX.UploadersLib/Properties/Resources.resx +++ b/ShareX.UploadersLib/Properties/Resources.resx @@ -181,9 +181,6 @@ Connected! - - ..\Favicons\Up1.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Status: Login failed. diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj index 6f5570374..b7c9dc201 100644 --- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj +++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj @@ -98,9 +98,6 @@ ..\packages\SSH.NET.2016.0.0\lib\net40\Renci.SshNet.dll True - - ..\Lib\Security.Cryptography.dll - @@ -355,7 +352,6 @@ - diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs index 81d15faf0..87c1c3126 100644 --- a/ShareX.UploadersLib/UploadersConfig.cs +++ b/ShareX.UploadersLib/UploadersConfig.cs @@ -248,11 +248,6 @@ public class UploadersConfig : SettingsBase public PushbulletSettings PushbulletSettings = new PushbulletSettings(); - // Up1 - - public string Up1Host = "https://up1.ca"; - public string Up1Key = "c61540b5ceecd05092799f936e27755f"; - // Lambda public LambdaSettings LambdaSettings = new LambdaSettings(); diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs index 12c2ad13d..c0ebc9cd1 100644 --- a/ShareX/Forms/AboutForm.cs +++ b/ShareX/Forms/AboutForm.cs @@ -83,7 +83,6 @@ public AboutForm() Pushbullet support: https://github.com/BallisticLingonberries Lambda support: https://github.com/mstojcevich VideoBin support: https://github.com/corey-/ -Up1 support: https://github.com/Upload CoinURL, QRnet, VURL, 2gp, SomeImage, OneTimeSecret, Polr support: https://github.com/DanielMcAssey Seafile support: https://github.com/zikeji Streamable support: https://github.com/streamablevideo @@ -107,9 +106,9 @@ public AboutForm() {2}: -Greenshot Image Editor: https://bitbucket.org/greenshot/greenshot +Greenshot Image Editor: https://github.com/greenshot/greenshot Json.NET: https://github.com/JamesNK/Newtonsoft.Json -SSH.NET: https://sshnet.codeplex.com +SSH.NET: https://github.com/sshnet/SSH.NET Icons: http://p.yusukekamiyamane.com ImageListView: https://github.com/oozcitak/imagelistview FFmpeg: http://www.ffmpeg.org @@ -120,7 +119,6 @@ public AboutForm() QrCode.Net: https://qrcodenet.codeplex.com System.Net.FtpClient: https://netftp.codeplex.com AWS SDK: http://aws.amazon.com/sdk-for-net/ -CLR Security: http://clrsecurity.codeplex.com Steamworks.NET: https://github.com/rlabrecque/Steamworks.NET OCR Space: http://ocr.space