Skip to content

Commit 149964a

Browse files
authored
Remove unused Unix PKCS12 shims
Because the PKCS#12/PFX import is now done with managed code, the PKCS12 shim was dead code.
1 parent 88abe67 commit 149964a

File tree

7 files changed

+0
-209
lines changed

7 files changed

+0
-209
lines changed

src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Pkcs12.cs

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafePkcs12Handle.Unix.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ set(NATIVECRYPTO_SOURCES
5959
pal_evp_cipher.c
6060
pal_hmac.c
6161
pal_ocsp.c
62-
pal_pkcs12.c
6362
pal_pkcs7.c
6463
pal_rsa.c
6564
pal_ssl.c

src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ void SSL_get0_alpn_selected(const SSL* ssl, const unsigned char** protocol, unsi
246246
REQUIRED_FUNCTION(d2i_BASIC_CONSTRAINTS) \
247247
REQUIRED_FUNCTION(d2i_EXTENDED_KEY_USAGE) \
248248
REQUIRED_FUNCTION(d2i_OCSP_RESPONSE) \
249-
REQUIRED_FUNCTION(d2i_PKCS12) \
250-
REQUIRED_FUNCTION(d2i_PKCS12_bio) \
251249
REQUIRED_FUNCTION(d2i_PKCS12_fp) \
252250
REQUIRED_FUNCTION(d2i_PKCS7) \
253251
REQUIRED_FUNCTION(d2i_PKCS7_bio) \
@@ -396,7 +394,6 @@ void SSL_get0_alpn_selected(const SSL* ssl, const unsigned char** protocol, unsi
396394
REQUIRED_FUNCTION(i2d_ASN1_TYPE) \
397395
REQUIRED_FUNCTION(i2d_OCSP_REQUEST) \
398396
REQUIRED_FUNCTION(i2d_OCSP_RESPONSE) \
399-
REQUIRED_FUNCTION(i2d_PKCS12) \
400397
REQUIRED_FUNCTION(i2d_PKCS7) \
401398
REQUIRED_FUNCTION(i2d_X509) \
402399
REQUIRED_FUNCTION(i2d_X509_PUBKEY) \
@@ -438,7 +435,6 @@ void SSL_get0_alpn_selected(const SSL* ssl, const unsigned char** protocol, unsi
438435
REQUIRED_FUNCTION(PEM_read_bio_X509_AUX) \
439436
REQUIRED_FUNCTION(PEM_read_bio_X509_CRL) \
440437
REQUIRED_FUNCTION(PEM_write_bio_X509_CRL) \
441-
REQUIRED_FUNCTION(PKCS12_create) \
442438
REQUIRED_FUNCTION(PKCS12_free) \
443439
REQUIRED_FUNCTION(PKCS12_parse) \
444440
REQUIRED_FUNCTION(PKCS7_sign) \
@@ -660,8 +656,6 @@ FOR_ALL_OPENSSL_FUNCTIONS
660656
#define d2i_BASIC_CONSTRAINTS d2i_BASIC_CONSTRAINTS_ptr
661657
#define d2i_EXTENDED_KEY_USAGE d2i_EXTENDED_KEY_USAGE_ptr
662658
#define d2i_OCSP_RESPONSE d2i_OCSP_RESPONSE_ptr
663-
#define d2i_PKCS12 d2i_PKCS12_ptr
664-
#define d2i_PKCS12_bio d2i_PKCS12_bio_ptr
665659
#define d2i_PKCS12_fp d2i_PKCS12_fp_ptr
666660
#define d2i_PKCS7 d2i_PKCS7_ptr
667661
#define d2i_PKCS7_bio d2i_PKCS7_bio_ptr
@@ -810,7 +804,6 @@ FOR_ALL_OPENSSL_FUNCTIONS
810804
#define i2d_ASN1_TYPE i2d_ASN1_TYPE_ptr
811805
#define i2d_OCSP_REQUEST i2d_OCSP_REQUEST_ptr
812806
#define i2d_OCSP_RESPONSE i2d_OCSP_RESPONSE_ptr
813-
#define i2d_PKCS12 i2d_PKCS12_ptr
814807
#define i2d_PKCS7 i2d_PKCS7_ptr
815808
#define i2d_X509 i2d_X509_ptr
816809
#define i2d_X509_PUBKEY i2d_X509_PUBKEY_ptr
@@ -852,7 +845,6 @@ FOR_ALL_OPENSSL_FUNCTIONS
852845
#define PEM_read_bio_X509_AUX PEM_read_bio_X509_AUX_ptr
853846
#define PEM_read_bio_X509_CRL PEM_read_bio_X509_CRL_ptr
854847
#define PEM_write_bio_X509_CRL PEM_write_bio_X509_CRL_ptr
855-
#define PKCS12_create PKCS12_create_ptr
856848
#define PKCS12_free PKCS12_free_ptr
857849
#define PKCS12_parse PKCS12_parse_ptr
858850
#define PKCS7_sign PKCS7_sign_ptr

src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.c

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_pkcs12.h

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,6 @@
342342
Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs" />
343343
<Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.OCSP.cs"
344344
Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OCSP.cs" />
345-
<Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs12.cs"
346-
Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs12.cs" />
347345
<Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs7.cs"
348346
Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs7.cs" />
349347
<Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs"
@@ -380,8 +378,6 @@
380378
Link="Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs" />
381379
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs"
382380
Link="Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs" />
383-
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafePkcs12Handle.Unix.cs"
384-
Link="Common\Microsoft\Win32\SafeHandles\SafePkcs12Handle.Unix.cs" />
385381
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafePkcs7Handle.Unix.cs"
386382
Link="Common\Microsoft\Win32\SafeHandles\SafePkcs7Handle.Unix.cs" />
387383
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs"

0 commit comments

Comments
 (0)