Update SKF

crypto/skf/skf_err.c

@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -25,6 +25,7 @@ static ERR_STRING_DATA SKF_str_functs[] = {
     {ERR_FUNC(SKF_F_SKF_CLEARSECURESTATE), "SKF_ClearSecureState"},
     {ERR_FUNC(SKF_F_SKF_CLOSEAPPLICATION), "SKF_CloseApplication"},
     {ERR_FUNC(SKF_F_SKF_CLOSECONTAINER), "SKF_CloseContainer"},
+    {ERR_FUNC(SKF_F_SKF_CLOSEDEVICE), "SKF_CloseDevice"},
     {ERR_FUNC(SKF_F_SKF_CLOSEHANDLE), "SKF_CloseHandle"},
     {ERR_FUNC(SKF_F_SKF_CONNECTDEV), "SKF_ConnectDev"},
     {ERR_FUNC(SKF_F_SKF_CREATEAPPLICATION), "SKF_CreateApplication"},
@@ -56,7 +57,17 @@ static ERR_STRING_DATA SKF_str_functs[] = {
     {ERR_FUNC(SKF_F_SKF_ENUMDEV), "SKF_EnumDev"},
     {ERR_FUNC(SKF_F_SKF_ENUMFILES), "SKF_EnumFiles"},
     {ERR_FUNC(SKF_F_SKF_EXPORTCERTIFICATE), "SKF_ExportCertificate"},
+    {ERR_FUNC(SKF_F_SKF_EXPORTECCENCPUBLICKEY), "SKF_ExportECCEncPublicKey"},
+    {ERR_FUNC(SKF_F_SKF_EXPORTECCPUBLICKEY), "SKF_ExportECCPublicKey"},
+    {ERR_FUNC(SKF_F_SKF_EXPORTECCSIGNPUBLICKEY),
+     "SKF_ExportECCSignPublicKey"},
+    {ERR_FUNC(SKF_F_SKF_EXPORTEVPPUBLICKEY), "SKF_ExportEVPPublicKey"},
     {ERR_FUNC(SKF_F_SKF_EXPORTPUBLICKEY), "SKF_ExportPublicKey"},
+    {ERR_FUNC(SKF_F_SKF_EXPORTRSAENCPUBLICKEY), "SKF_ExportRSAEncPublicKey"},
+    {ERR_FUNC(SKF_F_SKF_EXPORTRSAPUBLICKEY), "SKF_ExportRSAPublicKey"},
+    {ERR_FUNC(SKF_F_SKF_EXPORTRSASIGNPUBLICKEY),
+     "SKF_ExportRSASignPublicKey"},
+    {ERR_FUNC(SKF_F_SKF_EXPORTX509CERTIFICATE), "SKF_ExportX509Certificate"},
     {ERR_FUNC(SKF_F_SKF_EXTECCDECRYPT), "SKF_ExtECCDecrypt"},
     {ERR_FUNC(SKF_F_SKF_EXTECCENCRYPT), "SKF_ExtECCEncrypt"},
     {ERR_FUNC(SKF_F_SKF_EXTECCSIGN), "SKF_ExtECCSign"},
@@ -80,8 +91,12 @@ static ERR_STRING_DATA SKF_str_functs[] = {
     {ERR_FUNC(SKF_F_SKF_IMPORTCERTIFICATE), "SKF_ImportCertificate"},
     {ERR_FUNC(SKF_F_SKF_IMPORTECCKEYPAIR), "SKF_ImportECCKeyPair"},
     {ERR_FUNC(SKF_F_SKF_IMPORTECCPRIVATEKEY), "SKF_ImportECCPrivateKey"},
+    {ERR_FUNC(SKF_F_SKF_IMPORTPRIVATEKEY), "SKF_ImportPrivateKey"},
     {ERR_FUNC(SKF_F_SKF_IMPORTRSAKEYPAIR), "SKF_ImportRSAKeyPair"},
+    {ERR_FUNC(SKF_F_SKF_IMPORTRSAPRIVATEKEY), "SKF_ImportRSAPrivateKey"},
     {ERR_FUNC(SKF_F_SKF_IMPORTSESSIONKEY), "SKF_ImportSessionKey"},
+    {ERR_FUNC(SKF_F_SKF_IMPORTX509CERTIFICATEBYKEYUSAGE),
+     "SKF_ImportX509CertificateByKeyUsage"},
     {ERR_FUNC(SKF_F_SKF_LOADLIBRARY), "SKF_LoadLibrary"},
     {ERR_FUNC(SKF_F_SKF_LOCKDEV), "SKF_LockDev"},
     {ERR_FUNC(SKF_F_SKF_MAC), "SKF_Mac"},
@@ -93,6 +108,7 @@ static ERR_STRING_DATA SKF_str_functs[] = {
     {ERR_FUNC(SKF_F_SKF_NEWENVELOPEDKEY), "SKF_NewEnvelopedKey"},
     {ERR_FUNC(SKF_F_SKF_OPENAPPLICATION), "SKF_OpenApplication"},
     {ERR_FUNC(SKF_F_SKF_OPENCONTAINER), "SKF_OpenContainer"},
+    {ERR_FUNC(SKF_F_SKF_OPENDEVICE), "SKF_OpenDevice"},
     {ERR_FUNC(SKF_F_SKF_READFILE), "SKF_ReadFile"},
     {ERR_FUNC(SKF_F_SKF_RSAEXPORTSESSIONKEY), "SKF_RSAExportSessionKey"},
     {ERR_FUNC(SKF_F_SKF_RSASIGNDATA), "SKF_RSASignData"},
@@ -103,7 +119,6 @@ static ERR_STRING_DATA SKF_str_functs[] = {
     {ERR_FUNC(SKF_F_SKF_UNBLOCKPIN), "SKF_UnblockPIN"},
     {ERR_FUNC(SKF_F_SKF_UNLOCKDEV), "SKF_UnlockDev"},
     {ERR_FUNC(SKF_F_SKF_VERIFYPIN), "SKF_VerifyPIN"},
-    {ERR_FUNC(SKF_F_SKF_W), "SKF_WaitForDevEvent"},
     {ERR_FUNC(SKF_F_SKF_WAITFORDEVEVENT), "SKF_WaitForDevEvent"},
     {ERR_FUNC(SKF_F_SKF_WRITEFILE), "SKF_WriteFile"},
     {0, NULL}
@@ -112,18 +127,16 @@ static ERR_STRING_DATA SKF_str_functs[] = {
 static ERR_STRING_DATA SKF_str_reasons[] = {
     {ERR_REASON(SKF_R_APPLICATION_ALREADY_EXIST),
      "application already exist"},
-    {ERR_REASON(SKF_R_APPLICATION_NOT_EXISAT), "application not exisat"},
     {ERR_REASON(SKF_R_APPLICATION_NOT_EXIST), "application not exist"},
     {ERR_REASON(SKF_R_BUFFER_TOO_SMALL), "buffer too small"},
     {ERR_REASON(SKF_R_CERTIFICATE_NOT_FOUND), "certificate not found"},
+    {ERR_REASON(SKF_R_CONTAINER_TYPE_NOT_MATCH), "container type not match"},
     {ERR_REASON(SKF_R_CSP_IMPORT_PUBLIC_KEY_ERROR),
      "csp import public key error"},
     {ERR_REASON(SKF_R_DECRYPT_INVALID_PADDING), "decrypt invalid padding"},
     {ERR_REASON(SKF_R_DEVICE_REMOVED), "device removed"},
     {ERR_REASON(SKF_R_DIGEST_ERROR), "digest error"},
     {ERR_REASON(SKF_R_DSO_LOAD_FAILURE), "dso load failure"},
-    {ERR_REASON(SKF_R_ENVELOPE_PRVATE_KEY_FAILURE),
-     "envelope prvate key failure"},
     {ERR_REASON(SKF_R_EXPORT_FAILED), "export failed"},
     {ERR_REASON(SKF_R_FAILURE), "failure"},
     {ERR_REASON(SKF_R_FILE_ALREADY_EXIST), "file already exist"},
@@ -131,11 +144,10 @@ static ERR_STRING_DATA SKF_str_reasons[] = {
     {ERR_REASON(SKF_R_FILE_NOT_EXIST), "file not exist"},
     {ERR_REASON(SKF_R_FUNCTION_NOT_SUPPORTED), "function not supported"},
     {ERR_REASON(SKF_R_HASH_NOT_EQUAL), "hash not equal"},
-    {ERR_REASON(SKF_R_IMPORT_ENVELOPED_ECC_PRIVATE_KEY_FAILURE),
-     "import enveloped ecc private key failure"},
     {ERR_REASON(SKF_R_INVALID_APPLICATION_NAME), "invalid application name"},
     {ERR_REASON(SKF_R_INVALID_CONTAINER_TYPE), "invalid container type"},
     {ERR_REASON(SKF_R_INVALID_DIGEST_HANDLE), "invalid digest handle"},
+    {ERR_REASON(SKF_R_INVALID_ECC_PUBLIC_KEY), "invalid ecc public key"},
     {ERR_REASON(SKF_R_INVALID_HANDLE), "invalid handle"},
     {ERR_REASON(SKF_R_INVALID_INPUT_LENGTH), "invalid input length"},
     {ERR_REASON(SKF_R_INVALID_INPUT_VALUE), "invalid input value"},
@@ -150,6 +162,7 @@ static ERR_STRING_DATA SKF_str_reasons[] = {
     {ERR_REASON(SKF_R_INVALID_PIN_LENGTH), "invalid pin length"},
     {ERR_REASON(SKF_R_INVALID_RSA_MODULUS_LENGTH),
      "invalid rsa modulus length"},
+    {ERR_REASON(SKF_R_INVALID_RSA_PUBLIC_KEY), "invalid rsa public key"},
     {ERR_REASON(SKF_R_INVALID_USER_TYPE), "invalid user type"},
     {ERR_REASON(SKF_R_KEY_NOT_FOUND), "key not found"},
     {ERR_REASON(SKF_R_LOAD_LIBRARY_FAILURE), "load library failure"},
@@ -162,8 +175,9 @@ static ERR_STRING_DATA SKF_str_reasons[] = {
     {ERR_REASON(SKF_R_NOT_SUPPORTED_PKEY_ALGOR), "not supported pkey algor"},
     {ERR_REASON(SKF_R_NO_EVENT), "no event"},
     {ERR_REASON(SKF_R_NO_SPACE), "no space"},
-    {ERR_REASON(SKF_R_NULL_ARGUMENT), "null argument"},
     {ERR_REASON(SKF_R_OPERATION_NOT_SUPPORTED), "operation not supported"},
+    {ERR_REASON(SKF_R_PARSE_CERTIFICATE_FAILURE),
+     "parse certificate failure"},
     {ERR_REASON(SKF_R_PIN_INCORRECT), "pin incorrect"},
     {ERR_REASON(SKF_R_PIN_LOCKED), "pin locked"},
     {ERR_REASON(SKF_R_RANDOM_GENERATION_FAILED), "random generation failed"},
@@ -176,8 +190,12 @@ static ERR_STRING_DATA SKF_str_reasons[] = {
      "skf method not initialized"},
     {ERR_REASON(SKF_R_SUCCESS), "success"},
     {ERR_REASON(SKF_R_TIMEOUT), "timeout"},
+    {ERR_REASON(SKF_R_UNKNOWN_CERTIFICATE_KEYUSAGE),
+     "unknown certificate keyusage"},
     {ERR_REASON(SKF_R_UNKNOWN_ERROR), "unknown error"},
     {ERR_REASON(SKF_R_UNKNOWN_VENDOR), "unknown vendor"},
+    {ERR_REASON(SKF_R_UNSUPPORTED_PRIVATE_KEY_TYPE),
+     "unsupported private key type"},
     {ERR_REASON(SKF_R_USER_ALREADY_LOGGED_IN), "user already logged in"},
     {ERR_REASON(SKF_R_USER_NOT_LOGGED_IN), "user not logged in"},
     {ERR_REASON(SKF_R_USER_PIN_NOT_INITIALIZED), "user pin not initialized"},