Add new error codes, log unknown magic or algorithm IDs.

diff --git a/engines/e_capi.c b/engines/e_capi.c
index 8cbdf62ce37199f1e90530fc64503af16afa0bae..f641c4e713ca2c5b099c7824558922bbbd049885 100644 (file)
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -527,8 +527,10 @@ static EVP_PKEY *capi_load_privkey(ENGINE *eng, const char *key_id,
                rp = (RSAPUBKEY *)(bh + 1);
                if (rp->magic != 0x31415352)
                        {
-                       fprintf(stderr, "Invalid blob Magic %x\n",
-                                               rp->magic);
+                       char magstr[10];
+                       BIO_snprintf(10, magstr, "%lx", rp->magic);
+                       CAPIerr(CAPI_F_CAPI_LOAD_PRIVKEY, CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER);
+                       ERR_add_error_data(2, "magic=0x", magstr);
                        goto err;
                        }
                rsa_modulus = (unsigned char *)(rp + 1);
@@ -566,8 +568,10 @@ static EVP_PKEY *capi_load_privkey(ENGINE *eng, const char *key_id,
                dp = (DSSPUBKEY *)(bh + 1);
                if (dp->magic != 0x31535344)
                        {
-                       fprintf(stderr, "Invalid blob Magic %x\n",
-                                               dp->magic);
+                       char magstr[10];
+                       BIO_snprintf(10, magstr, "%lx", rp->magic);
+                       CAPIerr(CAPI_F_CAPI_LOAD_PRIVKEY, CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER);
+                       ERR_add_error_data(2, "magic=0x", magstr);
                        goto err;
                        }
                dsa_plen = dp->bitlen / 8;
@@ -604,8 +608,10 @@ static EVP_PKEY *capi_load_privkey(ENGINE *eng, const char *key_id,
                }
        else
                {
-BIO_dump_fp(stderr, pubkey, len);
+               char algstr[10];
+               BIO_snprintf(10, algstr, "%lx", bh->aiKeyAlg);
                CAPIerr(CAPI_F_CAPI_LOAD_PRIVKEY, CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM);
+               ERR_add_error_data(2, "aiKeyAlg=0x", algstr);
                goto err;
                }
 
@@ -676,7 +682,7 @@ int capi_rsa_sign(int dtype, const unsigned char *m, unsigned int m_len,
        default:
                {
                char algstr[10];
-               sprintf(algstr, "%lx", dtype);
+               BIO_snprintf(10, algstr, "%lx", dtype);
                CAPIerr(CAPI_F_CAPI_RSA_SIGN, CAPI_R_UNSUPPORTED_ALGORITHM_NID);
                ERR_add_error_data(2, "NID=0x", algstr);
                return -1;
@@ -749,7 +755,7 @@ int capi_rsa_priv_dec(int flen, const unsigned char *from,
        if(padding != RSA_PKCS1_PADDING)
                {
                char errstr[10];
-               sprintf(errstr, "%d", padding);
+               BIO_snprintf(10, errstr, "%d", padding);
                CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_UNSUPPORTED_PADDING);
                ERR_add_error_data(2, "padding=", errstr);
                return -1;
@@ -814,7 +820,7 @@ static void capi_addlasterror(void)
 static void capi_adderror(DWORD err)
        {
        char errstr[10];
-       sprintf(errstr, "%lX", err);
+       BIO_snprintf(10, errstr, "%lX", err);
        ERR_add_error_data(2, "Error code= 0x", errstr);
        }
 

diff --git a/engines/e_capi_err.c b/engines/e_capi_err.c
index bfead58c5997e7dc8e362e11b74e9f7648706a4b..0dfab056d3213badc43004c1a57a7d7058d84e0a 100644 (file)
--- a/engines/e_capi_err.c
+++ b/engines/e_capi_err.c
@@ -105,8 +105,10 @@ static ERR_STRING_DATA CAPI_str_reasons[]=
 {ERR_REASON(CAPI_R_ERROR_SIGNING_HASH)   ,"error signing hash"},
 {ERR_REASON(CAPI_R_FUNCTION_NOT_SUPPORTED),"function not supported"},
 {ERR_REASON(CAPI_R_GETUSERKEY_ERROR)     ,"getuserkey error"},
+{ERR_REASON(CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER),"invalid dsa public key blob magic number"},
 {ERR_REASON(CAPI_R_INVALID_LOOKUP_METHOD),"invalid lookup method"},
 {ERR_REASON(CAPI_R_INVALID_PUBLIC_KEY_BLOB),"invalid public key blob"},
+{ERR_REASON(CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER),"invalid rsa public key blob magic number"},
 {ERR_REASON(CAPI_R_PUBKEY_EXPORT_ERROR)  ,"pubkey export error"},
 {ERR_REASON(CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR),"pubkey export length error"},
 {ERR_REASON(CAPI_R_UNKNOWN_COMMAND)      ,"unknown command"},

diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h
index f0e1ff1f957f9b53f2f89db9fc571e4fa4dfb519..8f929f267ff20c2d5bfdc8d96436ef7d0b46d22a 100644 (file)
--- a/engines/e_capi_err.h
+++ b/engines/e_capi_err.h
@@ -99,8 +99,10 @@ static void ERR_CAPI_error(int function, int reason, char *file, int line);
 #define CAPI_R_ERROR_SIGNING_HASH                       111
 #define CAPI_R_FUNCTION_NOT_SUPPORTED                   112
 #define CAPI_R_GETUSERKEY_ERROR                                 113
+#define CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER         122
 #define CAPI_R_INVALID_LOOKUP_METHOD                    114
 #define CAPI_R_INVALID_PUBLIC_KEY_BLOB                  115
+#define CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER         123
 #define CAPI_R_PUBKEY_EXPORT_ERROR                      116
 #define CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR               117
 #define CAPI_R_UNKNOWN_COMMAND                          118