Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRYPT32]

Browse source 
* Sync with Wine 1.7.1.

svn path=/trunk/; revision=60131
This commit is contained in:
Amine Khaldi 2013-09-15 13:58:50 +00:00
parent 6d21511744
commit f630b228d0
22 changed files with 15 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/crypt32/CMakeLists.txt
View file

@ -39,13 +39,6 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
add_library(crypt32 SHARED ${SOURCE} crypt32.rc)
if(NOT MSVC)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
#allow_warnings(crypt32)
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
endif()
set_module_type(crypt32 win32dll)
target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)

9
reactos/dll/win32/crypt32/crypt32.rc
View file

@ -22,7 +22,14 @@
//#include "winuser.h"
//#include "cryptres.h"
#include "version.rc"
#define WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library"
#define WINE_FILENAME_STR "crypt32.dll"
#define WINE_FILEVERSION 5,131,2600,1243
#define WINE_FILEVERSION_STR "5.131.2600.1243"
#define WINE_PRODUCTVERSION 5,131,2600,1243
#define WINE_PRODUCTVERSION_STR "5.131.2600.1243"
#include <wine/wine_common_ver.rc>
#ifdef LANGUAGE_EN_US
#include "lang/crypt32_En.rc"

3
reactos/dll/win32/crypt32/cryptres.h
View file

@ -61,9 +61,6 @@
#define IDS_NETSCAPE_CA_POLICY_URL 1038
#define IDS_NETSCAPE_SSL_SERVER_NAME 1039
#define IDS_NETSCAPE_COMMENT 1040
#define IDS_SPC_SP_AGENCY_INFO 1041
#define IDS_SPC_FINANCIAL_CRITERIA 1042
#define IDS_SPC_MINIMAL_CRITERIA 1043
#define IDS_COUNTRY 1044
#define IDS_ORGANIZATION 1045
#define IDS_ORGANIZATIONAL_UNIT 1046

3
reactos/dll/win32/crypt32/lang/crypt32_De.rc
View file

@ -68,9 +68,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Richtlinien-URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Servername"
IDS_NETSCAPE_COMMENT "Netscape Kommentar"
IDS_SPC_SP_AGENCY_INFO "SpcSp Agentur-Information"
IDS_SPC_FINANCIAL_CRITERIA "Spc Finanzielle Kriterien"
IDS_SPC_MINIMAL_CRITERIA "Spc Minimale Kriterien"
IDS_COUNTRY "Land/Region"
IDS_ORGANIZATION "Organisation"
IDS_ORGANIZATIONAL_UNIT "Organisationseinheit"

7
reactos/dll/win32/crypt32/lang/crypt32_En.rc
View file

@ -48,7 +48,7 @@ STRINGTABLE
IDS_COUNTER_SIGN "Counter Sign"
IDS_CHALLENGE_PASSWORD "Challenge Password"
IDS_UNSTRUCTURED_ADDRESS "Unstructured Address"
IDS_SMIME_CAPABILITIES "SMIME Capabilities"
IDS_SMIME_CAPABILITIES "S/MIME Capabilities"
IDS_PREFER_SIGNED_DATA "Prefer Signed Data"
IDS_CPS "CPS"
IDS_USER_NOTICE "User Notice"
@ -65,9 +65,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName"
IDS_NETSCAPE_COMMENT "Netscape Comment"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Country/Region"
IDS_ORGANIZATION "Organization"
IDS_ORGANIZATIONAL_UNIT "Organizational Unit"
@ -77,7 +74,7 @@ STRINGTABLE
IDS_TITLE "Title"
IDS_GIVEN_NAME "Given Name"
IDS_INITIALS "Initials"
IDS_SUR_NAME "Sur Name"
IDS_SUR_NAME "Surname"
IDS_DOMAIN_COMPONENT "Domain Component"
IDS_STREET_ADDRESS "Street Address"
IDS_SERIAL_NUMBER "Serial Number"

3
reactos/dll/win32/crypt32/lang/crypt32_Fr.rc
View file

@ -68,9 +68,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "URL Netscape des stratégies d'ACL"
IDS_NETSCAPE_SSL_SERVER_NAME "Nom du serveur SSL de Netscape"
IDS_NETSCAPE_COMMENT "Commentaire Netscape"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Pays/Région"
IDS_ORGANIZATION "Organisation"
IDS_ORGANIZATIONAL_UNIT "Unité d'organisation"

3
reactos/dll/win32/crypt32/lang/crypt32_He.rc
View file

@ -67,9 +67,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName"
IDS_NETSCAPE_COMMENT "Netscape Comment"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Country/Region"
IDS_ORGANIZATION "Organization"
IDS_ORGANIZATIONAL_UNIT "Organizational Unit"

3
reactos/dll/win32/crypt32/lang/crypt32_Hu.rc
View file

@ -68,9 +68,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape CA szabályzat URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL KiszolgálóNév (ServerName)"
IDS_NETSCAPE_COMMENT "Netscape megjgyzés"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Ország/Régió"
IDS_ORGANIZATION "Szervezet"
IDS_ORGANIZATIONAL_UNIT "Szervezeti egység"

3
reactos/dll/win32/crypt32/lang/crypt32_It.rc
View file

@ -68,9 +68,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "URL Policy CA Netscape"
IDS_NETSCAPE_SSL_SERVER_NAME "NomeServer SSL Netscape"
IDS_NETSCAPE_COMMENT "Commento Netscape"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Paese/Regione"
IDS_ORGANIZATION "Organizzazione"
IDS_ORGANIZATIONAL_UNIT "Unità Organizzativa"

3
reactos/dll/win32/crypt32/lang/crypt32_Ko.rc
View file

@ -66,9 +66,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "넷스케이프 CA 방침 URL"
IDS_NETSCAPE_SSL_SERVER_NAME "넷스케이프 SSL 서버이름"
IDS_NETSCAPE_COMMENT "넷스케이프 설명"
IDS_SPC_SP_AGENCY_INFO "SpcSp관리자 정보"
IDS_SPC_FINANCIAL_CRITERIA "Spc재정상 원칙"
IDS_SPC_MINIMAL_CRITERIA "Spc최소 원칙"
IDS_COUNTRY "나라/지역"
IDS_ORGANIZATION "단체"
IDS_ORGANIZATIONAL_UNIT "단체(Organizational Unit)"

3
reactos/dll/win32/crypt32/lang/crypt32_Lt.rc
View file

@ -68,9 +68,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape LĮ politikos URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL serverio vardas"
IDS_NETSCAPE_COMMENT "Netscape komentaras"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Valstybė/regionas"
IDS_ORGANIZATION "Įstaiga"
IDS_ORGANIZATIONAL_UNIT "Įstaigos padalinys"

3
reactos/dll/win32/crypt32/lang/crypt32_Nl.rc
View file

@ -67,9 +67,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Beleids URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Server Naam"
IDS_NETSCAPE_COMMENT "Netscape Commentaar"
IDS_SPC_SP_AGENCY_INFO "SPC SP Agency Informatie"
IDS_SPC_FINANCIAL_CRITERIA "SPC Financiele Criteria"
IDS_SPC_MINIMAL_CRITERIA "SPC Minimale Criteria"
IDS_COUNTRY "Land/Regio"
IDS_ORGANIZATION "Organisatie"
IDS_ORGANIZATIONAL_UNIT "Organisatie Onderdeel"

3
reactos/dll/win32/crypt32/lang/crypt32_No.rc
View file

@ -67,9 +67,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape-CA-politikk-URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape-SSL-tjenernavn"
IDS_NETSCAPE_COMMENT "Netscape-kommentar"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Land/Region"
IDS_ORGANIZATION "Organisasjon"
IDS_ORGANIZATIONAL_UNIT "Organisasjonsell enhet"

3
reactos/dll/win32/crypt32/lang/crypt32_Pl.rc
View file

@ -65,9 +65,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Adres URL zasad CA Netscape"
IDS_NETSCAPE_SSL_SERVER_NAME "Nazwa serwera SSL Netscape"
IDS_NETSCAPE_COMMENT "Komentarz Netscape"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Kraj/Region"
IDS_ORGANIZATION "Organizacja"
IDS_ORGANIZATIONAL_UNIT "Jednostka organizacyjna"

6
reactos/dll/win32/crypt32/lang/crypt32_Pt.rc
View file

@ -68,9 +68,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "URL Política CA Netscape"
IDS_NETSCAPE_SSL_SERVER_NAME "Nome de Servidor SSL Netscape"
IDS_NETSCAPE_COMMENT "Comentário Netscape"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "País/Região"
IDS_ORGANIZATION "Organização"
IDS_ORGANIZATIONAL_UNIT "Unidade Organizacional"
@ -221,9 +218,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "URL Política CA Netscape"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName"
IDS_NETSCAPE_COMMENT "Comentário Netscape"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "País/Região"
IDS_ORGANIZATION "Organização"
IDS_ORGANIZATIONAL_UNIT "Unidade Organizacional"

3
reactos/dll/win32/crypt32/lang/crypt32_Ro.rc
View file

@ -68,9 +68,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "URL-ul politicii CA Netscape"
IDS_NETSCAPE_SSL_SERVER_NAME "Nume server SSL Netscape"
IDS_NETSCAPE_COMMENT "Comentariul Netscape"
IDS_SPC_SP_AGENCY_INFO "InformațiiAgențieSpcSp"
IDS_SPC_FINANCIAL_CRITERIA "CriteriiFinanciareSpc"
IDS_SPC_MINIMAL_CRITERIA "CriteriiMinimaleSpc"
IDS_COUNTRY "Țara/regiunea"
IDS_ORGANIZATION "Organizația"
IDS_ORGANIZATIONAL_UNIT "Unitatea organizațională"

3
reactos/dll/win32/crypt32/lang/crypt32_Sv.rc
View file

@ -67,9 +67,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName"
IDS_NETSCAPE_COMMENT "Netscape Comment"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Land/Region"
IDS_ORGANIZATION "Organisation"
IDS_ORGANIZATIONAL_UNIT "Organizational Unit"

3
reactos/dll/win32/crypt32/lang/crypt32_Uk.rc
View file

@ -71,9 +71,6 @@ STRINGTABLE
IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL"
IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName"
IDS_NETSCAPE_COMMENT "Netscape Коментар"
IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"
IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"
IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"
IDS_COUNTRY "Країна/Регіон"
IDS_ORGANIZATION "Організація"
IDS_ORGANIZATIONAL_UNIT "Organizational Unit"

6
reactos/dll/win32/crypt32/main.c
View file

@ -45,14 +45,12 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved)
crypt_oid_init();
break;
case DLL_PROCESS_DETACH:
if (pvReserved) break;
crypt_oid_free();
crypt_sip_free();
root_store_free();
default_chain_engine_free();
/* Don't release the default provider on process shutdown, there's
* no guarantee the provider dll hasn't already been unloaded.
*/
if (hDefProv && !pvReserved) CryptReleaseContext(hDefProv, 0);
if (hDefProv) CryptReleaseContext(hDefProv, 0);
break;
}
return TRUE;

2
reactos/dll/win32/crypt32/rootstore.c
View file

@ -326,6 +326,7 @@ static BOOL import_certs_from_file(int fd, HCERTSTORE store)
static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store,
BOOL allow_dir);
#ifdef HAVE_READDIR
static BOOL check_buffer_resize(char **ptr_buf, size_t *buf_size, size_t check_size)
{
if (check_size > *buf_size)
@ -351,6 +352,7 @@ static BOOL check_buffer_resize(char **ptr_buf, size_t *buf_size, size_t check_s
return TRUE;
}
#endif
/* Opens path, which must be a directory, and imports certificates from every
* file in the directory into store.

28
reactos/dll/win32/crypt32/version.rc
View file

@ -1,28 +0,0 @@
/*
* crypt32 dll version resources
*
* Copyright (C) 2006 Juan Lang
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library"
#define WINE_FILENAME_STR "crypt32.dll"
#define WINE_FILEVERSION 5,131,2600,1243
#define WINE_FILEVERSION_STR "5.131.2600.1243"
#define WINE_PRODUCTVERSION 5,131,2600,1243
#define WINE_PRODUCTVERSION_STR "5.131.2600.1243"
#include "wine/wine_common_ver.rc"

2
reactos/media/doc/README.WINE
View file

@ -63,7 +63,7 @@ reactos/dll/win32/comctl32 # Synced to Wine 1.7.1
reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37
reactos/dll/win32/compstui # Synced to Wine-1.5.19
reactos/dll/win32/credui # Synced to Wine-1.7.1
reactos/dll/win32/crypt32 # Synced to Wine-1.5.26
reactos/dll/win32/crypt32 # Synced to Wine-1.7.1
reactos/dll/win32/cryptdlg # Synced to Wine-1.5.26
reactos/dll/win32/cryptdll # Synced to Wine-1.5.26
reactos/dll/win32/cryptnet # Synced to Wine-1.5.26