diff --git a/PgpCore/PGP.EncryptSync.cs b/PgpCore/PGP.EncryptSync.cs index 18d6233..b11b48c 100644 --- a/PgpCore/PGP.EncryptSync.cs +++ b/PgpCore/PGP.EncryptSync.cs @@ -9,6 +9,7 @@ using PgpCore.Models; using PgpCore.Abstractions; using PgpCore.Extensions; +using static System.Net.Mime.MediaTypeNames; namespace PgpCore { @@ -99,7 +100,16 @@ public void Encrypt( PgpPublicKey publicKey = publicKeyRing.PreferredEncryptionKey ?? publicKeyRing.DefaultEncryptionKey; pk.AddMethod(publicKey); } - + /* + Encoding cp1253 = Encoding.GetEncoding(1253); + string text; + using (StreamReader reader = new StreamReader(inputStream, cp1253)) + { + text = reader.ReadToEnd(); + } + byte[] cp1253Bytes = cp1253.GetBytes(text); + MemoryStream inputStream1253 = new MemoryStream(cp1253Bytes); + */ if (CompressionAlgorithm != CompressionAlgorithmTag.Uncompressed) { using (Stream @out = pk.Open(outputStream, new byte[1 << 16])) @@ -142,7 +152,9 @@ public string Encrypt( if (headers == null) headers = new Dictionary(); - using (Stream inputStream = input.GetStream()) + Encoding encoding1253 = Encoding.GetEncoding(1253); + + using (Stream inputStream = input.GetStream(encoding1253)) using (Stream outputStream = new MemoryStream()) { Encrypt(inputStream, outputStream, true, withIntegrityCheck, name, headers, oldFormat); diff --git a/PgpCore/PGP.cs b/PgpCore/PGP.cs index b1c8db9..8c6173e 100644 --- a/PgpCore/PGP.cs +++ b/PgpCore/PGP.cs @@ -23,9 +23,9 @@ public partial class PGP : IPGP private const int BufferSize = 0x10000; private const string DefaultFileName = "name"; - public CompressionAlgorithmTag CompressionAlgorithm { get; set; } = CompressionAlgorithmTag.Uncompressed; + public CompressionAlgorithmTag CompressionAlgorithm { get; set; } = CompressionAlgorithmTag.Zip; - public SymmetricKeyAlgorithmTag SymmetricKeyAlgorithm { get; set; } = SymmetricKeyAlgorithmTag.TripleDes; + public SymmetricKeyAlgorithmTag SymmetricKeyAlgorithm { get; set; } = SymmetricKeyAlgorithmTag.Aes256; public int PgpSignatureType { get; set; } = PgpSignature.DefaultCertification; @@ -33,7 +33,7 @@ public partial class PGP : IPGP public PGPFileType FileType { get; set; } = PGPFileType.Binary; - public HashAlgorithmTag HashAlgorithmTag { get; set; } = HashAlgorithmTag.Sha1; + public HashAlgorithmTag HashAlgorithmTag { get; set; } = HashAlgorithmTag.Sha256; public IEncryptionKeys EncryptionKeys { get; private set; } diff --git a/PgpCore/PgpCore.csproj b/PgpCore/PgpCore.csproj index 7ad3504..5fe9ed6 100644 --- a/PgpCore/PgpCore.csproj +++ b/PgpCore/PgpCore.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net472 .NET Standard class library for using PGP mattosaurus