Commit 426d13e5 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard

crypt32: Implement CryptFormatObject for szOID_AUTHORITY_KEY_IDENTIFIER2.

parent ab81dc12
...@@ -172,3 +172,18 @@ STRINGTABLE DISCARDABLE ...@@ -172,3 +172,18 @@ STRINGTABLE DISCARDABLE
IDS_LOCALIZEDNAME_CA "Intermediate Certification Authorities" IDS_LOCALIZEDNAME_CA "Intermediate Certification Authorities"
IDS_LOCALIZEDNAME_ADDRESSBOOK "Other People" IDS_LOCALIZEDNAME_ADDRESSBOOK "Other People"
} }
STRINGTABLE DISCARDABLE
{
IDS_KEY_ID "KeyID="
IDS_CERT_ISSUER "Certificate Issuer: "
IDS_CERT_SERIAL_NUMBER "Certificate Serial Number="
IDS_ALT_NAME_OTHER_NAME "Other Name="
IDS_ALT_NAME_RFC822_NAME "Email Address="
IDS_ALT_NAME_DNS_NAME "DNS Name="
IDS_ALT_NAME_DIRECTORY_NAME "Directory Name="
IDS_ALT_NAME_URL "URL="
IDS_ALT_NAME_IP_ADDRESS "IP Address="
IDS_ALT_NAME_MASK "Mask="
IDS_ALT_NAME_REGISTERED_ID "Registered ID="
}
...@@ -165,4 +165,16 @@ ...@@ -165,4 +165,16 @@
#define IDS_LOCALIZEDNAME_CA 1143 #define IDS_LOCALIZEDNAME_CA 1143
#define IDS_LOCALIZEDNAME_ADDRESSBOOK 1144 #define IDS_LOCALIZEDNAME_ADDRESSBOOK 1144
#define IDS_KEY_ID 1200
#define IDS_CERT_ISSUER 1201
#define IDS_CERT_SERIAL_NUMBER 1202
#define IDS_ALT_NAME_OTHER_NAME 1203
#define IDS_ALT_NAME_RFC822_NAME 1204
#define IDS_ALT_NAME_DNS_NAME 1205
#define IDS_ALT_NAME_DIRECTORY_NAME 1206
#define IDS_ALT_NAME_URL 1207
#define IDS_ALT_NAME_IP_ADDRESS 1208
#define IDS_ALT_NAME_MASK 1209
#define IDS_ALT_NAME_REGISTERED_ID 1210
#endif /* ndef __WINE_CRYPTRES_H__ */ #endif /* ndef __WINE_CRYPTRES_H__ */
...@@ -404,7 +404,6 @@ static void test_format_object(void) ...@@ -404,7 +404,6 @@ static void test_format_object(void)
*/ */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size); ret = pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size);
todo_wine
ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND,
"expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError());
/* When called with the default encoding type for any undefined struct type /* When called with the default encoding type for any undefined struct type
...@@ -471,7 +470,6 @@ static void test_format_object(void) ...@@ -471,7 +470,6 @@ static void test_format_object(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL,
szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size); szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size);
todo_wine
ok(!ret && GetLastError() == E_INVALIDARG, ok(!ret && GetLastError() == E_INVALIDARG,
"expected E_INVALIDARG, got %d\n", GetLastError()); "expected E_INVALIDARG, got %d\n", GetLastError());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment