Skip to content

Commit 639911c

Browse files
DennisDyalloDennisDyallo
committed
misc: rename method
1 parent 33684a9 commit 639911c

File tree

15 files changed

+62
-64
lines changed

15 files changed

+62
-64
lines changed

‎Yubico.YubiKey/src/Yubico/YubiKey/Cryptography/AsnPrivateKeyReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Yubico.YubiKey.Cryptography;
2222

2323
internal class AsnPrivateKeyReader
2424
{
25-
public static IPrivateKey CreateKey(ReadOnlyMemory<byte> pkcs8EncodedKey)
25+
public static IPrivateKey CreatePrivateKey(ReadOnlyMemory<byte> pkcs8EncodedKey)
2626
{
2727
var reader = new AsnReader(pkcs8EncodedKey, AsnEncodingRules.DER);
2828
var seqPrivateKeyInfo = reader.ReadSequence();

‎Yubico.YubiKey/src/Yubico/YubiKey/Cryptography/AsnPublicKeyReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Yubico.YubiKey.Cryptography;
2121

2222
internal class AsnPublicKeyReader
2323
{
24-
public static IPublicKey CreateKey(ReadOnlyMemory<byte> pkcs8EncodedKey)
24+
public static IPublicKey CreatePublicKey(ReadOnlyMemory<byte> pkcs8EncodedKey)
2525
{
2626
var reader = new AsnReader(pkcs8EncodedKey, AsnEncodingRules.DER);
2727
var seqSubjectPublicKeyInfo = reader.ReadSequence();

‎Yubico.YubiKey/src/Yubico/YubiKey/Cryptography/AsnPublicKeyWriter.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ public static byte[] EncodeToSubjectPublicKeyInfo(ReadOnlyMemory<byte> publicPoi
3535
int coordinateLength = keyDefinition.LengthInBytes;
3636
return keyType switch
3737
{
38-
KeyType.ECP256 => CreateEcEncodedKey(publicPoint, Oids.ECP256, coordinateLength),
39-
KeyType.ECP384 => CreateEcEncodedKey(publicPoint, Oids.ECP384, coordinateLength),
40-
KeyType.ECP521 => CreateEcEncodedKey(publicPoint, Oids.ECP521, coordinateLength),
41-
KeyType.X25519 => CreateCurve25519ToSpki(publicPoint, keyType),
42-
KeyType.Ed25519 => CreateCurve25519ToSpki(publicPoint, keyType),
38+
KeyType.ECP256 => EncodeECDsaPublicKey(publicPoint, Oids.ECP256, coordinateLength),
39+
KeyType.ECP384 => EncodeECDsaPublicKey(publicPoint, Oids.ECP384, coordinateLength),
40+
KeyType.ECP521 => EncodeECDsaPublicKey(publicPoint, Oids.ECP521, coordinateLength),
41+
KeyType.X25519 or KeyType.Ed25519 => EncodeCurve25519PublicKey(publicPoint, keyType),
4342
_ => throw new NotSupportedException($"Key type {keyType} is not supported for encoding.")
4443
};
4544
}
@@ -173,7 +172,7 @@ public static byte[] EncodeToSubjectPublicKeyInfo(ECParameters parameters)
173172
return writer.Encode();
174173
}
175174

176-
private static byte[] CreateCurve25519ToSpki(ReadOnlyMemory<byte> publicKey, KeyType keyType)
175+
private static byte[] EncodeCurve25519PublicKey(ReadOnlyMemory<byte> publicKey, KeyType keyType)
177176
{
178177
var keyDefinition = keyType.GetKeyDefinition();
179178
if (keyDefinition.AlgorithmOid is null)
@@ -209,8 +208,7 @@ private static byte[] CreateCurve25519ToSpki(ReadOnlyMemory<byte> publicKey, Key
209208
return writer.Encode();
210209
}
211210

212-
// Creates an EC encoded key from a public point (which should be in the format: 0x04 + X + Y for uncompressed form)
213-
private static byte[] CreateEcEncodedKey(ReadOnlyMemory<byte> publicPoint, string curveOid, int coordinateSize)
211+
private static byte[] EncodeECDsaPublicKey(ReadOnlyMemory<byte> publicPoint, string curveOid, int coordinateSize)
214212
{
215213
if (publicPoint.Length == 0 || publicPoint.Span[0] != 0x04)
216214
{

‎Yubico.YubiKey/src/Yubico/YubiKey/Cryptography/ECPublicKeyParameters.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public static IPublicKey CreateFromValue(ReadOnlyMemory<byte> publicPoint, KeyTy
161161
/// Thrown if the public key is invalid.
162162
/// </exception>
163163
public static IPublicKey CreateFromPkcs8(ReadOnlyMemory<byte> encodedKey) =>
164-
AsnPublicKeyReader.CreateKey(encodedKey);
164+
AsnPublicKeyReader.CreatePublicKey(encodedKey);
165165
}
166166

167167
[Obsolete("Use ECPublicKey instead", false)]

‎Yubico.YubiKey/src/Yubico/YubiKey/Cryptography/RSAPublicKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,5 @@ public byte[] ExportSubjectPublicKeyInfo()
9797
/// Thrown if the public key is invalid.
9898
/// </exception>
9999
public static IPublicKey CreateFromPkcs8(ReadOnlyMemory<byte> encodedKey) =>
100-
AsnPublicKeyReader.CreateKey(encodedKey);
100+
AsnPublicKeyReader.CreatePublicKey(encodedKey);
101101
}

‎Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/ImportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void ImportPrivateKey_with_PrivateKey_Succeeds_and_HasExpectedValues(
4040
var testDevice = IntegrationTestDeviceEnumeration.GetTestDevice(testDeviceType);
4141
var (testPublicKey, testPrivateKey) = TestKeys.GetKeyPair(keyType);
4242
var testPivPublicKey = testPublicKey.AsPivPublicKey();
43-
var keyParameters = AsnPrivateKeyReader.CreateKey(testPrivateKey.EncodedKey);
43+
var keyParameters = AsnPrivateKeyReader.CreatePrivateKey(testPrivateKey.EncodedKey);
4444

4545
const PivPinPolicy expectedPinPolicy = PivPinPolicy.Once;
4646
const PivTouchPolicy expectedTouchPolicy = PivTouchPolicy.Always;

‎Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/KeyAgreeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void KeyAgree_Succeeds(
3939
// Arrange
4040
var (testPublicKey, testPrivateKey) = TestKeys.GetKeyPair(keyType);
4141
var testDevice = IntegrationTestDeviceEnumeration.GetTestDevice(testDeviceType);
42-
var privateKeyParameters = AsnPrivateKeyReader.CreateKey(testPrivateKey.EncodedKey);
42+
var privateKeyParameters = AsnPrivateKeyReader.CreatePrivateKey(testPrivateKey.EncodedKey);
4343
IPublicKey peerPublicKey;
4444
var peerPrivateKeyEcParameters = new ECParameters();
4545

‎Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/MoveDeleteKeyTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public void MoveKey_WithImportedKey(KeyType expectedAlgorithm)
7878
DeleteKeys(pivSession, sourceSlot, destinationSlot);
7979

8080
var (publicKey, privateKey) = TestKeys.GetKeyPair(expectedAlgorithm);
81-
var importedPrivateKey = AsnPrivateKeyReader.CreateKey(privateKey.EncodedKey);
82-
var importedPublicKey = AsnPublicKeyReader.CreateKey(publicKey.EncodedKey);
81+
var importedPrivateKey = AsnPrivateKeyReader.CreatePrivateKey(privateKey.EncodedKey);
82+
var importedPublicKey = AsnPublicKeyReader.CreatePublicKey(publicKey.EncodedKey);
8383

8484
pivSession.ImportPrivateKey(sourceSlot, importedPrivateKey);
8585

@@ -111,7 +111,7 @@ public void DeleteKey_WithImportedKey(KeyType expectedAlgorithm)
111111
pivSession.KeyCollector = new Simple39KeyCollector().Simple39KeyCollectorDelegate;
112112

113113
var testPrivateKey = TestKeys.GetTestPrivateKey(expectedAlgorithm);
114-
var privateKey = AsnPrivateKeyReader.CreateKey(testPrivateKey.EncodedKey);
114+
var privateKey = AsnPrivateKeyReader.CreatePrivateKey(testPrivateKey.EncodedKey);
115115
pivSession.ImportPrivateKey(slotToDelete, privateKey);
116116

117117
// Act

‎Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/SignTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ private async static Task<bool> ImportKey(
393393
pivSession.KeyCollector = collectorObj.Simple39KeyCollectorDelegate;
394394

395395
var testKey = TestKeys.GetTestPrivateKey(keyType);
396-
var privateKey = AsnPrivateKeyReader.CreateKey(testKey.EncodedKey);
396+
var privateKey = AsnPrivateKeyReader.CreatePrivateKey(testKey.EncodedKey);
397397
pivSession.ImportPrivateKey(slotNumber, privateKey, pinPolicy, touchPolicy);
398398

399399
await Task.Delay(200);

‎Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/AsnPrivateKeyReaderTests.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void FromEncodedKey_WithRsaPrivateKey_ReturnsCorrectKey(
3636
var keyBytes = testKey.EncodedKey;
3737

3838
// Act
39-
var result = AsnPrivateKeyReader.CreateKey(keyBytes);
39+
var result = AsnPrivateKeyReader.CreatePrivateKey(keyBytes);
4040

4141
// Assert
4242
Assert.NotNull(result);
@@ -71,7 +71,7 @@ public void FromEncodedKey_WithEcPrivateKey_ReturnsCorrectKey(
7171
var keyBytes = testKey.EncodedKey;
7272

7373
// Act
74-
var privateKeyParameters = AsnPrivateKeyReader.CreateKey(keyBytes);
74+
var privateKeyParameters = AsnPrivateKeyReader.CreatePrivateKey(keyBytes);
7575

7676
// Assert
7777
Assert.NotNull(privateKeyParameters);
@@ -107,7 +107,7 @@ public void FromEncodedKey_WithX25519PrivateKey_ReturnsCorrectKey()
107107
var keyBytes = testKey.EncodedKey;
108108

109109
// Act
110-
var result = AsnPrivateKeyReader.CreateKey(keyBytes);
110+
var result = AsnPrivateKeyReader.CreatePrivateKey(keyBytes);
111111

112112
// Assert
113113
Assert.NotNull(result);
@@ -126,7 +126,7 @@ public void FromEncodedKey_WithEd25519PrivateKey_ReturnsCorrectKey()
126126
var keyBytes = testKey.EncodedKey;
127127

128128
// Act
129-
var result = AsnPrivateKeyReader.CreateKey(keyBytes);
129+
var result = AsnPrivateKeyReader.CreatePrivateKey(keyBytes);
130130

131131
// Assert
132132
Assert.NotNull(result);
@@ -158,7 +158,7 @@ public void FromEncodedKey_WithInvalidVersion_ThrowsCryptographicException()
158158
var invalidKeyDer = writer.Encode();
159159

160160
// Act & Assert
161-
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreateKey(invalidKeyDer));
161+
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreatePrivateKey(invalidKeyDer));
162162
}
163163

164164
[Fact]
@@ -199,7 +199,7 @@ public void FromEncodedKey_WithInvalidRsaKeyVersion_ThrowsCryptographicException
199199
var invalidKeyDer = writer.Encode();
200200

201201
// Act & Assert
202-
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreateKey(invalidKeyDer));
202+
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreatePrivateKey(invalidKeyDer));
203203
}
204204

205205
[Fact]
@@ -233,7 +233,7 @@ public void FromEncodedKey_WithInvalidEcKeyVersion_ThrowsCryptographicException(
233233
var invalidKeyDer = writer.Encode();
234234

235235
// Act & Assert
236-
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreateKey(invalidKeyDer));
236+
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreatePrivateKey(invalidKeyDer));
237237
}
238238

239239
[Fact]
@@ -259,7 +259,7 @@ public void FromEncodedKey_WithUnsupportedCurve_ThrowsInvalidOperationException(
259259
var unsupportedCurveKeyDer = writer.Encode();
260260

261261
// Act & Assert
262-
Assert.Throws<InvalidOperationException>(() => AsnPrivateKeyReader.CreateKey(unsupportedCurveKeyDer));
262+
Assert.Throws<InvalidOperationException>(() => AsnPrivateKeyReader.CreatePrivateKey(unsupportedCurveKeyDer));
263263
}
264264

265265
[Fact]
@@ -285,7 +285,7 @@ public void FromEncodedKey_WithUnsupportedAlgorithm_ThrowsInvalidOperationExcept
285285
var unsupportedAlgorithmKeyDer = writer.Encode();
286286

287287
// Act & Assert
288-
Assert.Throws<InvalidOperationException>(() => AsnPrivateKeyReader.CreateKey(unsupportedAlgorithmKeyDer));
288+
Assert.Throws<InvalidOperationException>(() => AsnPrivateKeyReader.CreatePrivateKey(unsupportedAlgorithmKeyDer));
289289
}
290290

291291
[Fact]
@@ -309,7 +309,7 @@ public void FromEncodedKey_WithInvalidX25519KeyLength_ThrowsCryptographicExcepti
309309
var invalidKeyDer = writer.Encode();
310310

311311
// Act & Assert
312-
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreateKey(invalidKeyDer));
312+
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreatePrivateKey(invalidKeyDer));
313313
}
314314

315315
[Fact]
@@ -333,7 +333,7 @@ public void FromEncodedKey_WithInvalidEd25519KeyLength_ThrowsCryptographicExcept
333333
var invalidKeyDer = writer.Encode();
334334

335335
// Act & Assert
336-
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreateKey(invalidKeyDer));
336+
Assert.Throws<CryptographicException>(() => AsnPrivateKeyReader.CreatePrivateKey(invalidKeyDer));
337337
}
338338

339339
// [Theory]
@@ -382,9 +382,9 @@ public void Roundtrip_WithTestKeys_ShouldRetainKeyFunctionality(KeyType keyType)
382382
var testEncodedKey = testKey.EncodedKey;
383383

384384
// Act
385-
var privateKeyParameters = AsnPrivateKeyReader.CreateKey(testEncodedKey);
385+
var privateKeyParameters = AsnPrivateKeyReader.CreatePrivateKey(testEncodedKey);
386386
var exportedEncodedKey = privateKeyParameters.ExportPkcs8PrivateKey();
387-
var decodedParams = AsnPrivateKeyReader.CreateKey(exportedEncodedKey);
387+
var decodedParams = AsnPrivateKeyReader.CreatePrivateKey(exportedEncodedKey);
388388
AsnPrivateKeyWriterTests.KeyEquivalenceTestHelper.VerifyFunctionalEquivalence(privateKeyParameters, decodedParams, keyType);
389389
}
390390

@@ -397,8 +397,8 @@ public void FromEncodedKey_WithKeyPair_CorrectlyExtractsPrivateAndPublicComponen
397397
var publicKeyBytes = publicKey.EncodedKey;
398398

399399
// Act
400-
var privateParams = AsnPrivateKeyReader.CreateKey(privateKeyBytes);
401-
var publicParams = AsnPublicKeyReader.CreateKey(publicKeyBytes);
400+
var privateParams = AsnPrivateKeyReader.CreatePrivateKey(privateKeyBytes);
401+
var publicParams = AsnPublicKeyReader.CreatePublicKey(publicKeyBytes);
402402

403403
// Assert
404404
Assert.IsType<RSAPrivateKey>(privateParams);

0 commit comments

Comments
 (0)