Skip to content

Commit 7e6a475

Browse files
Xor-elXor-el
committed
fix some Oid naming cases
1 parent aeaae6f commit 7e6a475

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎CryptoLib/src/Asn1/Rosstandart/ClpRosstandartObjectIdentifiers.pas‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TRosstandartObjectIdentifiers = class abstract(TObject)
3232
FRosstandart, FIdTc26, FIdTc26Gost3411_12_256, FIdTc26Gost3411_12_512,
3333
FIdTc26HmacGost3411_12_256, FIdTc26HmacGost3411_12_512,
3434
FIdTc26Gost3410_12_256, FIdTc26Gost3410_12_512,
35-
FIdTc26SignwithdigestGost3410_12_256, FIdTc26SignwithdigestGost3410_12_512,
35+
FIdTc26SignWithDigestGost3410_12_256, FIdTc26SignWithDigestGost3410_12_512,
3636
FIdTc26Agreement, FIdTc26AgreementGost3410_12_256, FIdTc26AgreementGost3410_12_512,
3737
FIdTc26Gost3410_12_256ParamSet, FIdTc26Gost3410_12_256ParamSetA,
3838
FIdTc26Gost3410_12_256ParamSetB, FIdTc26Gost3410_12_256ParamSetC,
@@ -48,8 +48,8 @@ TRosstandartObjectIdentifiers = class abstract(TObject)
4848
class function GetIdTc26HmacGost3411_12_512: IDerObjectIdentifier; static; inline;
4949
class function GetIdTc26Gost3410_12_256: IDerObjectIdentifier; static; inline;
5050
class function GetIdTc26Gost3410_12_512: IDerObjectIdentifier; static; inline;
51-
class function GetIdTc26SignwithdigestGost3410_12_256: IDerObjectIdentifier; static; inline;
52-
class function GetIdTc26SignwithdigestGost3410_12_512: IDerObjectIdentifier; static; inline;
51+
class function GetIdTc26SignWithDigestGost3410_12_256: IDerObjectIdentifier; static; inline;
52+
class function GetIdTc26SignWithDigestGost3410_12_512: IDerObjectIdentifier; static; inline;
5353
class function GetIdTc26Agreement: IDerObjectIdentifier; static; inline;
5454
class function GetIdTc26AgreementGost3410_12_256: IDerObjectIdentifier; static; inline;
5555
class function GetIdTc26AgreementGost3410_12_512: IDerObjectIdentifier; static; inline;
@@ -74,8 +74,8 @@ TRosstandartObjectIdentifiers = class abstract(TObject)
7474
class property IdTc26HmacGost3411_12_512: IDerObjectIdentifier read GetIdTc26HmacGost3411_12_512;
7575
class property IdTc26Gost3410_12_256: IDerObjectIdentifier read GetIdTc26Gost3410_12_256;
7676
class property IdTc26Gost3410_12_512: IDerObjectIdentifier read GetIdTc26Gost3410_12_512;
77-
class property IdTc26SignwithdigestGost3410_12_256: IDerObjectIdentifier read GetIdTc26SignwithdigestGost3410_12_256;
78-
class property IdTc26SignwithdigestGost3410_12_512: IDerObjectIdentifier read GetIdTc26SignwithdigestGost3410_12_512;
77+
class property IdTc26SignWithDigestGost3410_12_256: IDerObjectIdentifier read GetIdTc26SignWithDigestGost3410_12_256;
78+
class property IdTc26SignWithDigestGost3410_12_512: IDerObjectIdentifier read GetIdTc26SignWithDigestGost3410_12_512;
7979
class property IdTc26Agreement: IDerObjectIdentifier read GetIdTc26Agreement;
8080
class property IdTc26AgreementGost3410_12_256: IDerObjectIdentifier read GetIdTc26AgreementGost3410_12_256;
8181
class property IdTc26AgreementGost3410_12_512: IDerObjectIdentifier read GetIdTc26AgreementGost3410_12_512;
@@ -114,8 +114,8 @@ class procedure TRosstandartObjectIdentifiers.Boot;
114114
FIdTc26HmacGost3411_12_512 := FIdTc26.Branch('1.4.2');
115115
FIdTc26Gost3410_12_256 := FIdTc26.Branch('1.1.1');
116116
FIdTc26Gost3410_12_512 := FIdTc26.Branch('1.1.2');
117-
FIdTc26SignwithdigestGost3410_12_256 := FIdTc26.Branch('1.3.2');
118-
FIdTc26SignwithdigestGost3410_12_512 := FIdTc26.Branch('1.3.3');
117+
FIdTc26SignWithDigestGost3410_12_256 := FIdTc26.Branch('1.3.2');
118+
FIdTc26SignWithDigestGost3410_12_512 := FIdTc26.Branch('1.3.3');
119119
FIdTc26Agreement := FIdTc26.Branch('1.6');
120120
FIdTc26AgreementGost3410_12_256 := FIdTc26Agreement.Branch('1');
121121
FIdTc26AgreementGost3410_12_512 := FIdTc26Agreement.Branch('2');
@@ -234,14 +234,14 @@ class function TRosstandartObjectIdentifiers.GetIdTc26HmacGost3411_12_512: IDerO
234234
Result := FIdTc26HmacGost3411_12_512;
235235
end;
236236

237-
class function TRosstandartObjectIdentifiers.GetIdTc26SignwithdigestGost3410_12_256: IDerObjectIdentifier;
237+
class function TRosstandartObjectIdentifiers.GetIdTc26SignWithDigestGost3410_12_256: IDerObjectIdentifier;
238238
begin
239-
Result := FIdTc26SignwithdigestGost3410_12_256;
239+
Result := FIdTc26SignWithDigestGost3410_12_256;
240240
end;
241241

242-
class function TRosstandartObjectIdentifiers.GetIdTc26SignwithdigestGost3410_12_512: IDerObjectIdentifier;
242+
class function TRosstandartObjectIdentifiers.GetIdTc26SignWithDigestGost3410_12_512: IDerObjectIdentifier;
243243
begin
244-
Result := FIdTc26SignwithdigestGost3410_12_512;
244+
Result := FIdTc26SignWithDigestGost3410_12_512;
245245
end;
246246

247247
class function TRosstandartObjectIdentifiers.GetRosstandart: IDerObjectIdentifier;

‎CryptoLib/src/Crypto/Operators/ClpDefaultDigestAlgorithmFinder.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ class procedure TDefaultDigestAlgorithmFinder.Boot;
170170

171171
FDigestOids.Add(TCryptoProObjectIdentifiers.GostR3411x94WithGostR3410x94, TCryptoProObjectIdentifiers.GostR3411);
172172
FDigestOids.Add(TCryptoProObjectIdentifiers.GostR3411x94WithGostR3410x2001, TCryptoProObjectIdentifiers.GostR3411);
173-
FDigestOids.Add(TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_256, TRosstandartObjectIdentifiers.IdTc26Gost3411_12_256);
174-
FDigestOids.Add(TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_512, TRosstandartObjectIdentifiers.IdTc26Gost3411_12_512);
173+
FDigestOids.Add(TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_256, TRosstandartObjectIdentifiers.IdTc26Gost3411_12_256);
174+
FDigestOids.Add(TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_512, TRosstandartObjectIdentifiers.IdTc26Gost3411_12_512);
175175

176176
FDigestOids.Add(TX509ObjectIdentifiers.IdRsassaPssShake128, TNistObjectIdentifiers.IdShake128);
177177
FDigestOids.Add(TX509ObjectIdentifiers.IdRsassaPssShake256, TNistObjectIdentifiers.IdShake256);

‎CryptoLib/src/Crypto/Operators/ClpDefaultSignatureAlgorithmFinder.pas‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -273,25 +273,25 @@ class procedure TDefaultSignatureAlgorithmFinder.Boot;
273273
AddAlgorithm('GOST3411WITHECGOST3410-2001', TCryptoProObjectIdentifiers.GostR3411x94WithGostR3410x2001);
274274
AddAlgorithm('GOST3411WITHGOST3410-2001', TCryptoProObjectIdentifiers.GostR3411x94WithGostR3410x2001);
275275
AddAlgorithm('GOST3411WITHECGOST3410-2012-256',
276-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_256);
276+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_256);
277277
AddAlgorithm('GOST3411WITHECGOST3410-2012-512',
278-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_512);
278+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_512);
279279
AddAlgorithm('GOST3411WITHGOST3410-2012-256',
280-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_256);
280+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_256);
281281
AddAlgorithm('GOST3411WITHGOST3410-2012-512',
282-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_512);
282+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_512);
283283
AddAlgorithm('GOST3411-2012-256WITHECGOST3410-2012-256',
284-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_256);
284+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_256);
285285
AddAlgorithm('GOST3411-2012-512WITHECGOST3410-2012-512',
286-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_512);
286+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_512);
287287
AddAlgorithm('GOST3411-2012-256WITHGOST3410-2012-256',
288-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_256);
288+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_256);
289289
AddAlgorithm('GOST3411-2012-512WITHGOST3410-2012-512',
290-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_512);
290+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_512);
291291
AddAlgorithm('GOST3411-2012-256WITHECGOST3410',
292-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_256);
292+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_256);
293293
AddAlgorithm('GOST3411-2012-512WITHECGOST3410',
294-
TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_512);
294+
TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_512);
295295

296296
AddAlgorithm('SHA1WITHCVC-ECDSA', TEacObjectIdentifiers.IdTAEcdsaSha1);
297297
AddAlgorithm('SHA224WITHCVC-ECDSA', TEacObjectIdentifiers.IdTAEcdsaSha224);
@@ -362,8 +362,8 @@ class procedure TDefaultSignatureAlgorithmFinder.Boot;
362362
//
363363
AddNoParams(TCryptoProObjectIdentifiers.GostR3411x94WithGostR3410x94);
364364
AddNoParams(TCryptoProObjectIdentifiers.GostR3411x94WithGostR3410x2001);
365-
AddNoParams(TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_256);
366-
AddNoParams(TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_512);
365+
AddNoParams(TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_256);
366+
AddNoParams(TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_512);
367367

368368
AddNoParams(TX509ObjectIdentifiers.IdRsassaPssShake128);
369369
AddNoParams(TX509ObjectIdentifiers.IdRsassaPssShake256);
@@ -446,9 +446,9 @@ class procedure TDefaultSignatureAlgorithmFinder.Boot;
446446
TCryptoProObjectIdentifiers.GostR3411);
447447
AddDigestOid(TCryptoProObjectIdentifiers.GostR3411x94WithGostR3410x2001,
448448
TCryptoProObjectIdentifiers.GostR3411);
449-
AddDigestOid(TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_256,
449+
AddDigestOid(TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_256,
450450
TRosstandartObjectIdentifiers.IdTc26Gost3411_12_256);
451-
AddDigestOid(TRosstandartObjectIdentifiers.IdTc26SignwithdigestGost3410_12_512,
451+
AddDigestOid(TRosstandartObjectIdentifiers.IdTc26SignWithDigestGost3410_12_512,
452452
TRosstandartObjectIdentifiers.IdTc26Gost3411_12_512);
453453

454454
AddDigestOid(TX9ObjectIdentifiers.IdDsaWithSha1, TOiwObjectIdentifiers.IdSha1);

0 commit comments

Comments
 (0)