зеркало из https://github.com/mozilla/gecko-dev.git
Bugzilla Bug 342582: improved PKM_CK_RVtoStr: map our vendor-defined error
codes, and return "unknown error" instead of NULL for unknown error codes.
This commit is contained in:
Родитель
ccb389386b
Коммит
d704ecc250
|
@ -159,13 +159,15 @@ static const tuple_str errStrings[] = {
|
||||||
{CKR_MUTEX_BAD , "CKR_MUTEX_BAD "},
|
{CKR_MUTEX_BAD , "CKR_MUTEX_BAD "},
|
||||||
{CKR_MUTEX_NOT_LOCKED , "CKR_MUTEX_NOT_LOCKED "},
|
{CKR_MUTEX_NOT_LOCKED , "CKR_MUTEX_NOT_LOCKED "},
|
||||||
{CKR_FUNCTION_REJECTED , "CKR_FUNCTION_REJECTED "},
|
{CKR_FUNCTION_REJECTED , "CKR_FUNCTION_REJECTED "},
|
||||||
{CKR_VENDOR_DEFINED , "CKR_VENDOR_DEFINED "}
|
{CKR_VENDOR_DEFINED , "CKR_VENDOR_DEFINED "},
|
||||||
|
{0xCE534351 , "CKR_NETSCAPE_CERTDB_FAILED "},
|
||||||
|
{0xCE534352 , "CKR_NETSCAPE_KEYDB_FAILED "}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const CK_ULONG numStrings = sizeof(errStrings) / sizeof(tuple_str);
|
static const CK_ULONG numStrings = sizeof(errStrings) / sizeof(tuple_str);
|
||||||
|
|
||||||
/* Returns constant error string for "CRV".
|
/* Returns constant error string for "CRV".
|
||||||
* Returns NULL of errNum is unknown.
|
* Returns "unknown error" if errNum is unknown.
|
||||||
*/
|
*/
|
||||||
const char *
|
const char *
|
||||||
PKM_CK_RVtoStr(CK_RV errNum) {
|
PKM_CK_RVtoStr(CK_RV errNum) {
|
||||||
|
@ -211,7 +213,7 @@ PKM_CK_RVtoStr(CK_RV errNum) {
|
||||||
return errStrings[low].errString;
|
return errStrings[low].errString;
|
||||||
if (errNum == errStrings[high].errNum)
|
if (errNum == errStrings[high].errNum)
|
||||||
return errStrings[high].errString;
|
return errStrings[high].errString;
|
||||||
return NULL;
|
return "unknown error";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче