From 563b6a59f462e0d4ce25c98953dc9f95b9896c53 Mon Sep 17 00:00:00 2001 From: "HOME-LAPTOP\\kshkulev" Date: Sun, 24 Aug 2025 18:26:02 +0900 Subject: [PATCH] Exclude GostXades from Hcs namespace --- .../Client/Api/Request/GostSigningMessageInspector.cs | 2 +- Hcs.Client/ClientApi/HcsCertificateHelper.cs | 4 ++-- Hcs.Client/ClientApi/HcsClientConfig.cs | 2 +- .../ClientApi/RemoteCaller/GostSigningMessageInspector.cs | 2 +- Hcs.Client/GostXades/Abstractions/ICertificateMatcher.cs | 2 +- Hcs.Client/GostXades/Abstractions/ICryptoProvider.cs | 2 +- Hcs.Client/GostXades/Abstractions/IIssuerComparer.cs | 2 +- Hcs.Client/GostXades/Abstractions/IXadesService.cs | 2 +- Hcs.Client/GostXades/CertificateMatcher.cs | 6 +++--- Hcs.Client/GostXades/CryptoProviderTypeEnum.cs | 2 +- Hcs.Client/GostXades/GostCryptoProvider.cs | 6 +++--- Hcs.Client/GostXades/GostXadesBesService.cs | 6 +++--- Hcs.Client/GostXades/Helpers/ArrayHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/CertificateHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/CollectionHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/ConvertHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/DateTimeHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/EnumerableHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/GostHashAlgorithmHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/KeyInfoHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/X509NameHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/XadesSignedXmlHelper.cs | 2 +- Hcs.Client/GostXades/Helpers/XmlDocumentHelper.cs | 2 +- Hcs.Client/GostXades/IssuerComparer.cs | 6 +++--- Hcs.Client/GostXades/XadesBesSignedXml.cs | 6 +++--- Hcs.Client/GostXades/XadesBesValidationException.cs | 2 +- Hcs.Client/GostXades/XadesInfo.cs | 2 +- 27 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Hcs.Client/Client/Api/Request/GostSigningMessageInspector.cs b/Hcs.Client/Client/Api/Request/GostSigningMessageInspector.cs index 129bc9e..7b30b76 100644 --- a/Hcs.Client/Client/Api/Request/GostSigningMessageInspector.cs +++ b/Hcs.Client/Client/Api/Request/GostSigningMessageInspector.cs @@ -1,5 +1,5 @@ using Hcs.Client.Internal; -using Hcs.GostXades; +using GostXades; using System.IO; using System.ServiceModel; using System.ServiceModel.Channels; diff --git a/Hcs.Client/ClientApi/HcsCertificateHelper.cs b/Hcs.Client/ClientApi/HcsCertificateHelper.cs index a885e79..88b6953 100644 --- a/Hcs.Client/ClientApi/HcsCertificateHelper.cs +++ b/Hcs.Client/ClientApi/HcsCertificateHelper.cs @@ -31,9 +31,9 @@ namespace Hcs.ClientApi } } - public static Hcs.GostXades.CryptoProviderTypeEnum GetProviderType(this X509Certificate2 certificate) + public static GostXades.CryptoProviderTypeEnum GetProviderType(this X509Certificate2 certificate) { - return (Hcs.GostXades.CryptoProviderTypeEnum)GetProviderInfo(certificate).Item1; + return (GostXades.CryptoProviderTypeEnum)GetProviderInfo(certificate).Item1; } public static Tuple GetProviderInfo(this X509Certificate2 certificate) diff --git a/Hcs.Client/ClientApi/HcsClientConfig.cs b/Hcs.Client/ClientApi/HcsClientConfig.cs index 7e7c7c3..18b2a0f 100644 --- a/Hcs.Client/ClientApi/HcsClientConfig.cs +++ b/Hcs.Client/ClientApi/HcsClientConfig.cs @@ -20,7 +20,7 @@ namespace Hcs.ClientApi /// /// Тип криптопровайдера полученный из сертификата /// - public Hcs.GostXades.CryptoProviderTypeEnum CryptoProviderType { get; internal set; } + public GostXades.CryptoProviderTypeEnum CryptoProviderType { get; internal set; } public GostCryptography.Base.ProviderType GostCryptoProviderType => (GostCryptography.Base.ProviderType)CryptoProviderType; diff --git a/Hcs.Client/ClientApi/RemoteCaller/GostSigningMessageInspector.cs b/Hcs.Client/ClientApi/RemoteCaller/GostSigningMessageInspector.cs index 2b72522..e12163f 100644 --- a/Hcs.Client/ClientApi/RemoteCaller/GostSigningMessageInspector.cs +++ b/Hcs.Client/ClientApi/RemoteCaller/GostSigningMessageInspector.cs @@ -1,4 +1,4 @@ -using Hcs.GostXades; +using GostXades; using System; using System.IO; using System.ServiceModel; diff --git a/Hcs.Client/GostXades/Abstractions/ICertificateMatcher.cs b/Hcs.Client/GostXades/Abstractions/ICertificateMatcher.cs index df650b6..a71aa3c 100644 --- a/Hcs.Client/GostXades/Abstractions/ICertificateMatcher.cs +++ b/Hcs.Client/GostXades/Abstractions/ICertificateMatcher.cs @@ -1,7 +1,7 @@ using Microsoft.Xades; using System.Security.Cryptography.X509Certificates; -namespace Hcs.GostXades.Abstractions +namespace GostXades.Abstractions { /// /// , XML diff --git a/Hcs.Client/GostXades/Abstractions/ICryptoProvider.cs b/Hcs.Client/GostXades/Abstractions/ICryptoProvider.cs index 5c8fc68..8e656fc 100644 --- a/Hcs.Client/GostXades/Abstractions/ICryptoProvider.cs +++ b/Hcs.Client/GostXades/Abstractions/ICryptoProvider.cs @@ -3,7 +3,7 @@ using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.Xml; -namespace Hcs.GostXades.Abstractions +namespace GostXades.Abstractions { public interface ICryptoProvider { diff --git a/Hcs.Client/GostXades/Abstractions/IIssuerComparer.cs b/Hcs.Client/GostXades/Abstractions/IIssuerComparer.cs index 9479806..82b8449 100644 --- a/Hcs.Client/GostXades/Abstractions/IIssuerComparer.cs +++ b/Hcs.Client/GostXades/Abstractions/IIssuerComparer.cs @@ -1,4 +1,4 @@ -namespace Hcs.GostXades.Abstractions +namespace GostXades.Abstractions { /// /// diff --git a/Hcs.Client/GostXades/Abstractions/IXadesService.cs b/Hcs.Client/GostXades/Abstractions/IXadesService.cs index 9e3b7a3..4c67dcd 100644 --- a/Hcs.Client/GostXades/Abstractions/IXadesService.cs +++ b/Hcs.Client/GostXades/Abstractions/IXadesService.cs @@ -1,4 +1,4 @@ -namespace Hcs.GostXades.Abstractions +namespace GostXades.Abstractions { public interface IXadesService { diff --git a/Hcs.Client/GostXades/CertificateMatcher.cs b/Hcs.Client/GostXades/CertificateMatcher.cs index d723fb4..a11dd21 100644 --- a/Hcs.Client/GostXades/CertificateMatcher.cs +++ b/Hcs.Client/GostXades/CertificateMatcher.cs @@ -1,5 +1,5 @@ -using Hcs.GostXades.Abstractions; -using Hcs.GostXades.Helpers; +using GostXades.Abstractions; +using GostXades.Helpers; using Microsoft.Xades; using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Linq; using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.Xml; -namespace Hcs.GostXades +namespace GostXades { public class CertificateMatcher : ICertificateMatcher { diff --git a/Hcs.Client/GostXades/CryptoProviderTypeEnum.cs b/Hcs.Client/GostXades/CryptoProviderTypeEnum.cs index f9f0fab..b256449 100644 --- a/Hcs.Client/GostXades/CryptoProviderTypeEnum.cs +++ b/Hcs.Client/GostXades/CryptoProviderTypeEnum.cs @@ -1,4 +1,4 @@ -namespace Hcs.GostXades +namespace GostXades { /// /// Типы криптопровайдеров diff --git a/Hcs.Client/GostXades/GostCryptoProvider.cs b/Hcs.Client/GostXades/GostCryptoProvider.cs index f259917..053e5f3 100644 --- a/Hcs.Client/GostXades/GostCryptoProvider.cs +++ b/Hcs.Client/GostXades/GostCryptoProvider.cs @@ -1,8 +1,8 @@ using GostCryptography.Config; using GostCryptography.Gost_R3410; using GostCryptography.Gost_R3411; -using Hcs.GostXades.Abstractions; -using Hcs.GostXades.Helpers; +using GostXades.Abstractions; +using GostXades.Helpers; using Microsoft.Xades; using Org.BouncyCastle.X509; using System; @@ -12,7 +12,7 @@ using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.Xml; -namespace Hcs.GostXades +namespace GostXades { public class GostCryptoProvider : ICryptoProvider { diff --git a/Hcs.Client/GostXades/GostXadesBesService.cs b/Hcs.Client/GostXades/GostXadesBesService.cs index e0ea01b..00c8fa3 100644 --- a/Hcs.Client/GostXades/GostXadesBesService.cs +++ b/Hcs.Client/GostXades/GostXadesBesService.cs @@ -1,8 +1,8 @@ -using Hcs.GostXades.Abstractions; -using Hcs.GostXades.Helpers; +using GostXades.Abstractions; +using GostXades.Helpers; using System; -namespace Hcs.GostXades +namespace GostXades { public class GostXadesBesService : IXadesService { diff --git a/Hcs.Client/GostXades/Helpers/ArrayHelper.cs b/Hcs.Client/GostXades/Helpers/ArrayHelper.cs index 81d7d45..712abbc 100644 --- a/Hcs.Client/GostXades/Helpers/ArrayHelper.cs +++ b/Hcs.Client/GostXades/Helpers/ArrayHelper.cs @@ -1,6 +1,6 @@ using System; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class ArrayHelper { diff --git a/Hcs.Client/GostXades/Helpers/CertificateHelper.cs b/Hcs.Client/GostXades/Helpers/CertificateHelper.cs index d0b8192..09f6ba1 100644 --- a/Hcs.Client/GostXades/Helpers/CertificateHelper.cs +++ b/Hcs.Client/GostXades/Helpers/CertificateHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Security.Cryptography.X509Certificates; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class CertificateHelper { diff --git a/Hcs.Client/GostXades/Helpers/CollectionHelper.cs b/Hcs.Client/GostXades/Helpers/CollectionHelper.cs index 40bafb8..f81db27 100644 --- a/Hcs.Client/GostXades/Helpers/CollectionHelper.cs +++ b/Hcs.Client/GostXades/Helpers/CollectionHelper.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Linq; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class CollectionHelper { diff --git a/Hcs.Client/GostXades/Helpers/ConvertHelper.cs b/Hcs.Client/GostXades/Helpers/ConvertHelper.cs index 1a9e87b..8b44bb3 100644 --- a/Hcs.Client/GostXades/Helpers/ConvertHelper.cs +++ b/Hcs.Client/GostXades/Helpers/ConvertHelper.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class ConvertHelper { diff --git a/Hcs.Client/GostXades/Helpers/DateTimeHelper.cs b/Hcs.Client/GostXades/Helpers/DateTimeHelper.cs index ddedd0e..51af66d 100644 --- a/Hcs.Client/GostXades/Helpers/DateTimeHelper.cs +++ b/Hcs.Client/GostXades/Helpers/DateTimeHelper.cs @@ -1,6 +1,6 @@ using System; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class DateTimeHelper { diff --git a/Hcs.Client/GostXades/Helpers/EnumerableHelper.cs b/Hcs.Client/GostXades/Helpers/EnumerableHelper.cs index 72439fb..5ca801e 100644 --- a/Hcs.Client/GostXades/Helpers/EnumerableHelper.cs +++ b/Hcs.Client/GostXades/Helpers/EnumerableHelper.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class EnumerableHelper { diff --git a/Hcs.Client/GostXades/Helpers/GostHashAlgorithmHelper.cs b/Hcs.Client/GostXades/Helpers/GostHashAlgorithmHelper.cs index 3b5a020..aa6af99 100644 --- a/Hcs.Client/GostXades/Helpers/GostHashAlgorithmHelper.cs +++ b/Hcs.Client/GostXades/Helpers/GostHashAlgorithmHelper.cs @@ -1,7 +1,7 @@ using GostCryptography.Config; using System; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class GostHashAlgorithmHelper { diff --git a/Hcs.Client/GostXades/Helpers/KeyInfoHelper.cs b/Hcs.Client/GostXades/Helpers/KeyInfoHelper.cs index aba27ae..d0957a3 100644 --- a/Hcs.Client/GostXades/Helpers/KeyInfoHelper.cs +++ b/Hcs.Client/GostXades/Helpers/KeyInfoHelper.cs @@ -3,7 +3,7 @@ using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.Xml; using System.Xml; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class KeyInfoHelper { diff --git a/Hcs.Client/GostXades/Helpers/X509NameHelper.cs b/Hcs.Client/GostXades/Helpers/X509NameHelper.cs index 3fc030a..1c6081c 100644 --- a/Hcs.Client/GostXades/Helpers/X509NameHelper.cs +++ b/Hcs.Client/GostXades/Helpers/X509NameHelper.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Text; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class X509NameHelper { diff --git a/Hcs.Client/GostXades/Helpers/XadesSignedXmlHelper.cs b/Hcs.Client/GostXades/Helpers/XadesSignedXmlHelper.cs index bb48c9b..c09e77e 100644 --- a/Hcs.Client/GostXades/Helpers/XadesSignedXmlHelper.cs +++ b/Hcs.Client/GostXades/Helpers/XadesSignedXmlHelper.cs @@ -1,7 +1,7 @@ using Microsoft.Xades; using System.Xml; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class XadesSignedXmlHelper { diff --git a/Hcs.Client/GostXades/Helpers/XmlDocumentHelper.cs b/Hcs.Client/GostXades/Helpers/XmlDocumentHelper.cs index a663a24..39803e2 100644 --- a/Hcs.Client/GostXades/Helpers/XmlDocumentHelper.cs +++ b/Hcs.Client/GostXades/Helpers/XmlDocumentHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Xml; -namespace Hcs.GostXades.Helpers +namespace GostXades.Helpers { public static class XmlDocumentHelper { diff --git a/Hcs.Client/GostXades/IssuerComparer.cs b/Hcs.Client/GostXades/IssuerComparer.cs index dc03cd8..4c588f9 100644 --- a/Hcs.Client/GostXades/IssuerComparer.cs +++ b/Hcs.Client/GostXades/IssuerComparer.cs @@ -1,11 +1,11 @@ -using Hcs.GostXades.Abstractions; -using Hcs.GostXades.Helpers; +using GostXades.Abstractions; +using GostXades.Helpers; using Org.BouncyCastle.Asn1.X509; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -namespace Hcs.GostXades +namespace GostXades { public class IssuerComparer : IIssuerComparer { diff --git a/Hcs.Client/GostXades/XadesBesSignedXml.cs b/Hcs.Client/GostXades/XadesBesSignedXml.cs index 5c5d27f..9f93bcb 100644 --- a/Hcs.Client/GostXades/XadesBesSignedXml.cs +++ b/Hcs.Client/GostXades/XadesBesSignedXml.cs @@ -1,5 +1,5 @@ -using Hcs.GostXades.Abstractions; -using Hcs.GostXades.Helpers; +using GostXades.Abstractions; +using GostXades.Helpers; using Microsoft.Xades; using System; using System.Linq; @@ -7,7 +7,7 @@ using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Xml; -namespace Hcs.GostXades +namespace GostXades { public class XadesBesSignedXml : XadesSignedXml { diff --git a/Hcs.Client/GostXades/XadesBesValidationException.cs b/Hcs.Client/GostXades/XadesBesValidationException.cs index 2e8b77d..7a89a42 100644 --- a/Hcs.Client/GostXades/XadesBesValidationException.cs +++ b/Hcs.Client/GostXades/XadesBesValidationException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace Hcs.GostXades +namespace GostXades { [Serializable] public class XadesBesValidationException : Exception diff --git a/Hcs.Client/GostXades/XadesInfo.cs b/Hcs.Client/GostXades/XadesInfo.cs index 5973678..899374c 100644 --- a/Hcs.Client/GostXades/XadesInfo.cs +++ b/Hcs.Client/GostXades/XadesInfo.cs @@ -1,7 +1,7 @@ using System; using System.Security.Cryptography.X509Certificates; -namespace Hcs.GostXades +namespace GostXades { public class XadesInfo {