Skip to content

Commit f6e2377

Browse files
AaronRobinsonMSFTAaronRobinsonMSFT
authored
Convert Crypto P/Invokes to GeneratedDllImport. (#61742)
* Convert Crypto P/Invokes to GeneratedDllImport.
1 parent 8275c37 commit f6e2377

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+399
-400
lines changed

‎src/libraries/Common/src/Interop/Android/Interop.JObjectLifetime.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ internal static partial class Interop
1010
{
1111
internal static partial class JObjectLifetime
1212
{
13-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_NewGlobalReference")]
14-
internal static extern IntPtr NewGlobalReference(IntPtr obj);
13+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_NewGlobalReference")]
14+
internal static partial IntPtr NewGlobalReference(IntPtr obj);
1515

16-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_DeleteGlobalReference")]
17-
internal static extern void DeleteGlobalReference(IntPtr obj);
16+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_DeleteGlobalReference")]
17+
internal static partial void DeleteGlobalReference(IntPtr obj);
1818

1919
internal class SafeJObjectHandle : SafeHandle
2020
{

‎src/libraries/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Bignum.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ internal static partial class Interop
1010
// TODO: [AndroidCrypto] Rename class to AndroidCrypto once all consumers are split in Android vs. Unix
1111
internal static partial class Crypto
1212
{
13-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_BigNumToBinary")]
14-
private static extern unsafe int BigNumToBinary(SafeBignumHandle a, byte* to);
13+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_BigNumToBinary")]
14+
private static unsafe partial int BigNumToBinary(SafeBignumHandle a, byte* to);
1515

16-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_GetBigNumBytes")]
17-
private static extern int GetBigNumBytes(SafeBignumHandle a);
16+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_GetBigNumBytes")]
17+
private static partial int GetBigNumBytes(SafeBignumHandle a);
1818

1919
internal static unsafe byte[]? ExtractBignum(SafeBignumHandle? bignum, int targetSize)
2020
{

‎src/libraries/Common/src/Interop/Android/System.Security.Cryptography.Native.Android/Interop.Cipher.cs‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ internal static partial class Interop
1010
{
1111
internal static partial class Crypto
1212
{
13-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherCreate")]
14-
internal static extern SafeEvpCipherCtxHandle EvpCipherCreate(
13+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherCreate")]
14+
internal static partial SafeEvpCipherCtxHandle EvpCipherCreate(
1515
IntPtr cipher,
1616
ref byte key,
1717
int keyLength,
1818
ref byte iv,
1919
int enc);
2020

21-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherCreatePartial")]
22-
internal static extern SafeEvpCipherCtxHandle EvpCipherCreatePartial(
21+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherCreatePartial")]
22+
internal static partial SafeEvpCipherCtxHandle EvpCipherCreatePartial(
2323
IntPtr cipher);
2424

25-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherSetKeyAndIV")]
25+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherSetKeyAndIV")]
2626
[return: MarshalAs(UnmanagedType.Bool)]
27-
private static extern bool EvpCipherSetKeyAndIV(
27+
private static partial bool EvpCipherSetKeyAndIV(
2828
SafeEvpCipherCtxHandle ctx,
2929
ref byte key,
3030
ref byte iv,
@@ -46,9 +46,9 @@ ref MemoryMarshal.GetReference(iv),
4646
}
4747
}
4848

49-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherSetNonceLength")]
49+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherSetNonceLength")]
5050
[return: MarshalAs(UnmanagedType.Bool)]
51-
private static extern bool AndroidCryptoNative_CipherSetNonceLength(
51+
private static partial bool AndroidCryptoNative_CipherSetNonceLength(
5252
SafeEvpCipherCtxHandle ctx, int nonceLength);
5353

5454
internal static void CipherSetNonceLength(SafeEvpCipherCtxHandle ctx, int nonceLength)
@@ -59,20 +59,20 @@ internal static void CipherSetNonceLength(SafeEvpCipherCtxHandle ctx, int nonceL
5959
}
6060
}
6161

62-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherDestroy")]
63-
internal static extern void EvpCipherDestroy(IntPtr ctx);
62+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherDestroy")]
63+
internal static partial void EvpCipherDestroy(IntPtr ctx);
6464

65-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherReset")]
65+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherReset")]
6666
[return: MarshalAs(UnmanagedType.Bool)]
67-
internal static extern bool EvpCipherReset(SafeEvpCipherCtxHandle ctx);
67+
internal static partial bool EvpCipherReset(SafeEvpCipherCtxHandle ctx);
6868

69-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherCtxSetPadding")]
69+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherCtxSetPadding")]
7070
[return: MarshalAs(UnmanagedType.Bool)]
71-
internal static extern bool EvpCipherCtxSetPadding(SafeEvpCipherCtxHandle x, int padding);
71+
internal static partial bool EvpCipherCtxSetPadding(SafeEvpCipherCtxHandle x, int padding);
7272

73-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherUpdate")]
73+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherUpdate")]
7474
[return: MarshalAs(UnmanagedType.Bool)]
75-
private static extern bool EvpCipherUpdate(
75+
private static partial bool EvpCipherUpdate(
7676
SafeEvpCipherCtxHandle ctx,
7777
ref byte @out,
7878
out int outl,
@@ -93,9 +93,9 @@ ref MemoryMarshal.GetReference(input),
9393
input.Length);
9494
}
9595

96-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherUpdateAAD")]
96+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherUpdateAAD")]
9797
[return: MarshalAs(UnmanagedType.Bool)]
98-
private static extern bool CipherUpdateAAD(
98+
private static partial bool CipherUpdateAAD(
9999
SafeEvpCipherCtxHandle ctx,
100100
ref byte @in,
101101
int inl);
@@ -113,9 +113,9 @@ ref MemoryMarshal.GetReference(input),
113113
}
114114
}
115115

116-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherFinalEx")]
116+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherFinalEx")]
117117
[return: MarshalAs(UnmanagedType.Bool)]
118-
private static extern bool EvpCipherFinalEx(
118+
private static partial bool EvpCipherFinalEx(
119119
SafeEvpCipherCtxHandle ctx,
120120
ref byte outm,
121121
out int outl);
@@ -128,99 +128,99 @@ internal static bool EvpCipherFinalEx(
128128
return EvpCipherFinalEx(ctx, ref MemoryMarshal.GetReference(output), out bytesWritten);
129129
}
130130

131-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherSetTagLength")]
131+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherSetTagLength")]
132132
[return: MarshalAs(UnmanagedType.Bool)]
133-
internal static extern bool CipherSetTagLength(
133+
internal static partial bool CipherSetTagLength(
134134
SafeEvpCipherCtxHandle ctx,
135135
int tagLength);
136136

137-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherIsSupported")]
137+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_CipherIsSupported")]
138138
[return: MarshalAs(UnmanagedType.Bool)]
139-
internal static extern bool CipherIsSupported(IntPtr cipher);
139+
internal static partial bool CipherIsSupported(IntPtr cipher);
140140

141-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Ecb")]
142-
internal static extern IntPtr EvpAes128Ecb();
141+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Ecb")]
142+
internal static partial IntPtr EvpAes128Ecb();
143143

144-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Cbc")]
145-
internal static extern IntPtr EvpAes128Cbc();
144+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Cbc")]
145+
internal static partial IntPtr EvpAes128Cbc();
146146

147-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Gcm")]
148-
internal static extern IntPtr EvpAes128Gcm();
147+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Gcm")]
148+
internal static partial IntPtr EvpAes128Gcm();
149149

150-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Cfb8")]
151-
internal static extern IntPtr EvpAes128Cfb8();
150+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Cfb8")]
151+
internal static partial IntPtr EvpAes128Cfb8();
152152

153-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Cfb128")]
154-
internal static extern IntPtr EvpAes128Cfb128();
153+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Cfb128")]
154+
internal static partial IntPtr EvpAes128Cfb128();
155155

156-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Ccm")]
157-
internal static extern IntPtr EvpAes128Ccm();
156+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes128Ccm")]
157+
internal static partial IntPtr EvpAes128Ccm();
158158

159-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Ecb")]
160-
internal static extern IntPtr EvpAes192Ecb();
159+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Ecb")]
160+
internal static partial IntPtr EvpAes192Ecb();
161161

162-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Cbc")]
163-
internal static extern IntPtr EvpAes192Cbc();
162+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Cbc")]
163+
internal static partial IntPtr EvpAes192Cbc();
164164

165-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Gcm")]
166-
internal static extern IntPtr EvpAes192Gcm();
165+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Gcm")]
166+
internal static partial IntPtr EvpAes192Gcm();
167167

168-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Cfb8")]
169-
internal static extern IntPtr EvpAes192Cfb8();
168+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Cfb8")]
169+
internal static partial IntPtr EvpAes192Cfb8();
170170

171-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Cfb128")]
172-
internal static extern IntPtr EvpAes192Cfb128();
171+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Cfb128")]
172+
internal static partial IntPtr EvpAes192Cfb128();
173173

174-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Ccm")]
175-
internal static extern IntPtr EvpAes192Ccm();
174+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes192Ccm")]
175+
internal static partial IntPtr EvpAes192Ccm();
176176

177-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Ecb")]
178-
internal static extern IntPtr EvpAes256Ecb();
177+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Ecb")]
178+
internal static partial IntPtr EvpAes256Ecb();
179179

180-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Cbc")]
181-
internal static extern IntPtr EvpAes256Cbc();
180+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Cbc")]
181+
internal static partial IntPtr EvpAes256Cbc();
182182

183-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Gcm")]
184-
internal static extern IntPtr EvpAes256Gcm();
183+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Gcm")]
184+
internal static partial IntPtr EvpAes256Gcm();
185185

186-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Cfb128")]
187-
internal static extern IntPtr EvpAes256Cfb128();
186+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Cfb128")]
187+
internal static partial IntPtr EvpAes256Cfb128();
188188

189-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Cfb8")]
190-
internal static extern IntPtr EvpAes256Cfb8();
189+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Cfb8")]
190+
internal static partial IntPtr EvpAes256Cfb8();
191191

192-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Ccm")]
193-
internal static extern IntPtr EvpAes256Ccm();
192+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Aes256Ccm")]
193+
internal static partial IntPtr EvpAes256Ccm();
194194

195-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_DesCbc")]
196-
internal static extern IntPtr EvpDesCbc();
195+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_DesCbc")]
196+
internal static partial IntPtr EvpDesCbc();
197197

198-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_DesEcb")]
199-
internal static extern IntPtr EvpDesEcb();
198+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_DesEcb")]
199+
internal static partial IntPtr EvpDesEcb();
200200

201-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_DesCfb8")]
202-
internal static extern IntPtr EvpDesCfb8();
201+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_DesCfb8")]
202+
internal static partial IntPtr EvpDesCfb8();
203203

204-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Des3Cbc")]
205-
internal static extern IntPtr EvpDes3Cbc();
204+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Des3Cbc")]
205+
internal static partial IntPtr EvpDes3Cbc();
206206

207-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Des3Ecb")]
208-
internal static extern IntPtr EvpDes3Ecb();
207+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Des3Ecb")]
208+
internal static partial IntPtr EvpDes3Ecb();
209209

210-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Des3Cfb8")]
211-
internal static extern IntPtr EvpDes3Cfb8();
210+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Des3Cfb8")]
211+
internal static partial IntPtr EvpDes3Cfb8();
212212

213-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Des3Cfb64")]
214-
internal static extern IntPtr EvpDes3Cfb64();
213+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_Des3Cfb64")]
214+
internal static partial IntPtr EvpDes3Cfb64();
215215

216-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_RC2Cbc")]
217-
internal static extern IntPtr EvpRC2Cbc();
216+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_RC2Cbc")]
217+
internal static partial IntPtr EvpRC2Cbc();
218218

219-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_RC2Ecb")]
220-
internal static extern IntPtr EvpRC2Ecb();
219+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_RC2Ecb")]
220+
internal static partial IntPtr EvpRC2Ecb();
221221

222-
[DllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_ChaCha20Poly1305")]
223-
internal static extern IntPtr EvpChaCha20Poly1305();
222+
[GeneratedDllImport(Libraries.AndroidCryptoNative, EntryPoint = "AndroidCryptoNative_ChaCha20Poly1305")]
223+
internal static partial IntPtr EvpChaCha20Poly1305();
224224

225225
internal enum EvpCipherDirection : int
226226
{

0 commit comments

Comments
 (0)