Correct a lot of printing calls. Remove extra arguments...
authorRichard Levitte <levitte@openssl.org>
Thu, 3 Apr 2003 23:39:48 +0000 (23:39 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 3 Apr 2003 23:39:48 +0000 (23:39 +0000)
15 files changed:
apps/ca.c
apps/ocsp.c
apps/pkcs12.c
apps/pkcs8.c
apps/req.c
apps/s_cb.c
apps/s_server.c
apps/speed.c
crypto/asn1/t_crl.c
crypto/asn1/t_req.c
crypto/dsa/dsatest.c
crypto/ocsp/ocsp_prn.c
crypto/x509v3/v3_prn.c
crypto/x509v3/v3_sxnet.c
ssl/ssltest.c

index eb328f2..ea84fac 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -2096,7 +2096,7 @@ again2:
 
        BIO_printf(bio_err,"Certificate is to be certified until ");
        ASN1_UTCTIME_print(bio_err,X509_get_notAfter(ret));
-       if (days) BIO_printf(bio_err," (%d days)",days);
+       if (days) BIO_printf(bio_err," (%ld days)",days);
        BIO_printf(bio_err, "\n");
 
        if (!batch)
index 885e68e..0cf4aad 100644 (file)
@@ -781,7 +781,7 @@ int MAIN(int argc, char **argv)
 
        if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL)
                {
-               BIO_printf(out, "Responder Error: %s (%ld)\n",
+               BIO_printf(out, "Responder Error: %s (%d)\n",
                                OCSP_response_status_str(i), i);
                ret = 0;
                goto end;
@@ -845,7 +845,7 @@ int MAIN(int argc, char **argv)
 
                if(i <= 0)
                        {
-                       BIO_printf(bio_err, "Response Verify Failure\n", i);
+                       BIO_printf(bio_err, "Response Verify Failure\n");
                        ERR_print_errors(bio_err);
                        }
                else
index a00b438..385011b 100644 (file)
@@ -814,8 +814,9 @@ int alg_print (BIO *x, X509_ALGOR *alg)
        unsigned char *p;
        p = alg->parameter->value.sequence->data;
        pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);
-       BIO_printf (bio_err, "%s, Iteration %d\n", 
-       OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)), ASN1_INTEGER_get(pbe->iter));
+       BIO_printf (bio_err, "%s, Iteration %ld\n", 
+               OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),
+               ASN1_INTEGER_get(pbe->iter));
        PBEPARAM_free (pbe);
        return 0;
 }
index 6be27e7..ee8cf02 100644 (file)
@@ -235,7 +235,7 @@ int MAIN(int argc, char **argv)
                        return (1);
                }
                if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
-                       BIO_printf(bio_err, "Error converting key\n", outfile);
+                       BIO_printf(bio_err, "Error converting key\n");
                        ERR_print_errors(bio_err);
                        return (1);
                }
@@ -259,8 +259,7 @@ int MAIN(int argc, char **argv)
                        if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
                                        p8pass, strlen(p8pass),
                                        NULL, 0, iter, p8inf))) {
-                               BIO_printf(bio_err, "Error encrypting key\n",
-                                                                outfile);
+                               BIO_printf(bio_err, "Error encrypting key\n");
                                ERR_print_errors(bio_err);
                                return (1);
                        }
@@ -303,7 +302,7 @@ int MAIN(int argc, char **argv)
                }
 
                if (!p8) {
-                       BIO_printf (bio_err, "Error reading key\n", outfile);
+                       BIO_printf (bio_err, "Error reading key\n");
                        ERR_print_errors(bio_err);
                        return (1);
                }
@@ -317,13 +316,13 @@ int MAIN(int argc, char **argv)
        }
 
        if (!p8inf) {
-               BIO_printf(bio_err, "Error decrypting key\n", outfile);
+               BIO_printf(bio_err, "Error decrypting key\n");
                ERR_print_errors(bio_err);
                return (1);
        }
 
        if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
-               BIO_printf(bio_err, "Error converting key\n", outfile);
+               BIO_printf(bio_err, "Error converting key\n");
                ERR_print_errors(bio_err);
                return (1);
        }
index c297599..80b623c 100644 (file)
@@ -728,10 +728,10 @@ bad:
                if (newkey < MIN_KEY_LENGTH && (pkey_type == TYPE_RSA || pkey_type == TYPE_DSA))
                        {
                        BIO_printf(bio_err,"private key length is too short,\n");
-                       BIO_printf(bio_err,"it needs to be at least %d bits, not %d\n",MIN_KEY_LENGTH,newkey);
+                       BIO_printf(bio_err,"it needs to be at least %d bits, not %ld\n",MIN_KEY_LENGTH,newkey);
                        goto end;
                        }
-               BIO_printf(bio_err,"Generating a %d bit %s private key\n",
+               BIO_printf(bio_err,"Generating a %ld bit %s private key\n",
                        newkey,(pkey_type == TYPE_RSA)?"RSA":
                        (pkey_type == TYPE_DSA)?"DSA":"EC");
 
index 675527d..1410178 100644 (file)
@@ -239,14 +239,14 @@ long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi,
 
        if (cmd == (BIO_CB_READ|BIO_CB_RETURN))
                {
-               BIO_printf(out,"read from %08X [%08lX] (%d bytes => %ld (0x%X))\n",
+               BIO_printf(out,"read from %p [%p] (%d bytes => %ld (0x%lX))\n",
                        bio,argp,argi,ret,ret);
                BIO_dump(out,argp,(int)ret);
                return(ret);
                }
        else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
                {
-               BIO_printf(out,"write to %08X [%08lX] (%d bytes => %ld (0x%X))\n",
+               BIO_printf(out,"write to %p [%p] (%d bytes => %ld (0x%lX))\n",
                        bio,argp,argi,ret,ret);
                BIO_dump(out,argp,(int)ret);
                }
index 814f3b9..7ce65a3 100644 (file)
@@ -971,23 +971,23 @@ static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
        {
        BIO_printf(bio,"%4ld items in the session cache\n",
                SSL_CTX_sess_number(ssl_ctx));
-       BIO_printf(bio,"%4d client connects (SSL_connect())\n",
+       BIO_printf(bio,"%4ld client connects (SSL_connect())\n",
                SSL_CTX_sess_connect(ssl_ctx));
-       BIO_printf(bio,"%4d client renegotiates (SSL_connect())\n",
+       BIO_printf(bio,"%4ld client renegotiates (SSL_connect())\n",
                SSL_CTX_sess_connect_renegotiate(ssl_ctx));
-       BIO_printf(bio,"%4d client connects that finished\n",
+       BIO_printf(bio,"%4ld client connects that finished\n",
                SSL_CTX_sess_connect_good(ssl_ctx));
-       BIO_printf(bio,"%4d server accepts (SSL_accept())\n",
+       BIO_printf(bio,"%4ld server accepts (SSL_accept())\n",
                SSL_CTX_sess_accept(ssl_ctx));
-       BIO_printf(bio,"%4d server renegotiates (SSL_accept())\n",
+       BIO_printf(bio,"%4ld server renegotiates (SSL_accept())\n",
                SSL_CTX_sess_accept_renegotiate(ssl_ctx));
-       BIO_printf(bio,"%4d server accepts that finished\n",
+       BIO_printf(bio,"%4ld server accepts that finished\n",
                SSL_CTX_sess_accept_good(ssl_ctx));
-       BIO_printf(bio,"%4d session cache hits\n",SSL_CTX_sess_hits(ssl_ctx));
-       BIO_printf(bio,"%4d session cache misses\n",SSL_CTX_sess_misses(ssl_ctx));
-       BIO_printf(bio,"%4d session cache timeouts\n",SSL_CTX_sess_timeouts(ssl_ctx));
-       BIO_printf(bio,"%4d callback cache hits\n",SSL_CTX_sess_cb_hits(ssl_ctx));
-       BIO_printf(bio,"%4d cache full overflows (%d allowed)\n",
+       BIO_printf(bio,"%4ld session cache hits\n",SSL_CTX_sess_hits(ssl_ctx));
+       BIO_printf(bio,"%4ld session cache misses\n",SSL_CTX_sess_misses(ssl_ctx));
+       BIO_printf(bio,"%4ld session cache timeouts\n",SSL_CTX_sess_timeouts(ssl_ctx));
+       BIO_printf(bio,"%4ld callback cache hits\n",SSL_CTX_sess_cb_hits(ssl_ctx));
+       BIO_printf(bio,"%4ld cache full overflows (%ld allowed)\n",
                SSL_CTX_sess_cache_full(ssl_ctx),
                SSL_CTX_sess_get_cache_size(ssl_ctx));
        }
index c4add36..a634b11 100644 (file)
@@ -2382,8 +2382,8 @@ static void pkey_print_message(char *str, char *str2, long num, int bits,
 
 static void print_result(int alg,int run_no,int count,double time_used)
        {
-       BIO_printf(bio_err,mr ? "+R:%ld:%s:%f\n"
-                  : "%ld %s's in %.2fs\n",count,names[alg],time_used);
+       BIO_printf(bio_err,mr ? "+R:%d:%s:%f\n"
+                  : "%d %s's in %.2fs\n",count,names[alg],time_used);
        results[alg][run_no]=((double)count)/time_used*lengths[run_no];
        }
 
index 757c148..f183a11 100644 (file)
@@ -121,7 +121,7 @@ int X509_CRL_print(BIO *out, X509_CRL *x)
                r = sk_X509_REVOKED_value(rev, i);
                BIO_printf(out,"    Serial Number: ");
                i2a_ASN1_INTEGER(out,r->serialNumber);
-               BIO_printf(out,"\n        Revocation Date: ","");
+               BIO_printf(out,"\n        Revocation Date: ");
                ASN1_TIME_print(out,r->revocationDate);
                BIO_printf(out,"\n");
                X509V3_extensions_print(out, "CRL entry extensions",
index b70bda7..7088486 100644 (file)
@@ -254,7 +254,7 @@ get_next:
                                obj=X509_EXTENSION_get_object(ex);
                                i2a_ASN1_OBJECT(bp,obj);
                                j=X509_EXTENSION_get_critical(ex);
-                               if (BIO_printf(bp,": %s\n",j?"critical":"","") <= 0)
+                               if (BIO_printf(bp,": %s\n",j?"critical":"") <= 0)
                                        goto err;
                                if(!X509V3_EXT_print(bp, ex, 0, 16))
                                        {
index 71ff566..53c73c5 100644 (file)
@@ -166,7 +166,7 @@ int main(int argc, char **argv)
                BIO_printf(bio_err,"%02X%02X%02X%02X ",
                        seed[i],seed[i+1],seed[i+2],seed[i+3]);
                }
-       BIO_printf(bio_err,"\ncounter=%d h=%d\n",counter,h);
+       BIO_printf(bio_err,"\ncounter=%d h=%ld\n",counter,h);
                
        if (dsa == NULL) goto end;
        DSA_print(bio_err,dsa,0);
index 4b7bc28..3dfb51c 100644 (file)
@@ -194,7 +194,7 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
 
        if (BIO_puts(bp,"OCSP Response Data:\n") <= 0) goto err;
        l=ASN1_ENUMERATED_get(o->responseStatus);
-       if (BIO_printf(bp,"    OCSP Response Status: %s (0x%x)\n",
+       if (BIO_printf(bp,"    OCSP Response Status: %s (0x%lx)\n",
                       OCSP_response_status_str(l), l) <= 0) goto err;
        if (rb == NULL) return 1;
         if (BIO_puts(bp,"    Response Type: ") <= 0)
@@ -252,7 +252,7 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
                                {
                                l=ASN1_ENUMERATED_get(rev->revocationReason);
                                if (BIO_printf(bp, 
-                                        "\n    Revocation Reason: %s (0x%x)",
+                                        "\n    Revocation Reason: %s (0x%lx)",
                                               OCSP_crl_reason_str(l), l) <= 0)
                                        goto err;
                                }
index 754808b..9be6c95 100644 (file)
@@ -182,7 +182,7 @@ int X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts
                obj=X509_EXTENSION_get_object(ex);
                i2a_ASN1_OBJECT(bp,obj);
                j=X509_EXTENSION_get_critical(ex);
-               if (BIO_printf(bp,": %s\n",j?"critical":"","") <= 0)
+               if (BIO_printf(bp,": %s\n",j?"critical":"") <= 0)
                        return 0;
                if(!X509V3_EXT_print(bp, ex, flag, 12))
                        {
index d3f4ba3..860909a 100644 (file)
@@ -109,7 +109,7 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
        SXNETID *id;
        int i;
        v = ASN1_INTEGER_get(sx->version);
-       BIO_printf(out, "%*sVersion: %d (0x%X)", indent, "", v + 1, v);
+       BIO_printf(out, "%*sVersion: %ld (0x%lX)", indent, "", v + 1, v);
        for(i = 0; i < sk_SXNETID_num(sx->ids); i++) {
                id = sk_SXNETID_value(sx->ids, i);
                tmp = i2s_ASN1_INTEGER(NULL, id->zone);
index 45b211b..a304398 100644 (file)
@@ -1597,7 +1597,7 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
                (void)BIO_flush(bio_err);
                if(!RSA_generate_key_ex(rsa_tmp,keylength,RSA_F4,NULL))
                        {
-                       BIO_printf(bio_err, "Error generating key.", keylength);
+                       BIO_printf(bio_err, "Error generating key.");
                        RSA_free(rsa_tmp);
                        rsa_tmp = NULL;
                        }