From 4e1a23ccba22f5c34589fe564aed0ccdf444ff5f Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Sun, 14 May 2017 10:12:25 +0800 Subject: [PATCH] snprintf VS not support snprintf --- crypto/saf/saf_ec.c | 5 +++++ crypto/saf/saf_keyhandle.c | 2 ++ crypto/saf/saf_lib.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/crypto/saf/saf_ec.c b/crypto/saf/saf_ec.c index 4ba99360..069bdfdf 100644 --- a/crypto/saf/saf_ec.c +++ b/crypto/saf/saf_ec.c @@ -164,8 +164,11 @@ int SAF_GetEccPublicKey( char key_id[1024]; int len; + /* + snprintf(key_id, sizeof(key_id), "%s.%s", (char *)pucContainerName, SGD_GetKeyUsageName(uiKeyUsage)); + */ if (!(pkey = ENGINE_load_public_key(app->engine, key_id, NULL, NULL))) { SAFerr(SAF_F_SAF_GETECCPUBLICKEY, ERR_R_ENGINE_LIB); @@ -232,7 +235,9 @@ int SAF_EccSign( EVP_PKEY_CTX *pctx = NULL; size_t siglen; + /* snprintf(key_id, sizeof(key_id), "%s.sign", (char *)pucContainerName); + */ if (!(pkey = ENGINE_load_private_key(app->engine, key_id, NULL, NULL)) || !(pctx = EVP_PKEY_CTX_new(pkey, app->engine)) diff --git a/crypto/saf/saf_keyhandle.c b/crypto/saf/saf_keyhandle.c index 78dc8e6e..7fa1aa98 100644 --- a/crypto/saf/saf_keyhandle.c +++ b/crypto/saf/saf_keyhandle.c @@ -204,7 +204,9 @@ int SAF_ImportEncedKey( EVP_PKEY_CTX *pctx = NULL; char key_id[1024]; + /* snprintf(key_id, sizeof(key_id), "%s.enc", hobj->pucContainerName); + */ if (!(pkey = ENGINE_load_private_key(hobj->app->engine, key_id, NULL, NULL)) || !(pctx = EVP_PKEY_CTX_new(pkey, hobj->app->engine)) diff --git a/crypto/saf/saf_lib.c b/crypto/saf/saf_lib.c index a879d031..6e9f8c22 100644 --- a/crypto/saf/saf_lib.c +++ b/crypto/saf/saf_lib.c @@ -63,8 +63,10 @@ EVP_PKEY *SAF_load_private_key(SAF_APP *app, const char *container, int flags) return NULL; } + /* snprintf(key_id, sizeof(key_id), "%s.%s", container, ((flags & EVP_PKT_SIGN) ? "sign" : "enc")); + */ if (!(pkey = ENGINE_load_private_key(app->engine, key_id, NULL, NULL))) { SAFerr(SAF_F_SAF_LOAD_PRIVATE_KEY, SAF_R_LOAD_PRIVATE_KEY_FAILURE); @@ -95,8 +97,10 @@ EVP_PKEY *SAF_load_public_key(SAF_APP *app, const char *container, int flags) return NULL; } + /* snprintf(key_id, sizeof(key_id), "%s.%s", container, ((flags & EVP_PKT_SIGN) ? "sign" : "enc")); + */ if (!(pkey = ENGINE_load_public_key(app->engine, key_id, NULL, NULL))) { SAFerr(SAF_F_SAF_LOAD_PUBLIC_KEY, SAF_R_LOAD_PUBLIC_KEY_FAILURE);