Make rand_win.c UNICODE savvy.

[openssl.git] / crypto / asn1 / t_req.c

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 7ebb39b2160a3794a7932a5bcda4f4d3b25776a2..32eef7e78f66788681eb346e09e1e1dae2438667 100644 (file)
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -63,6 +63,8 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 #ifndef OPENSSL_NO_FP_API
 int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
@@ -91,7 +93,6 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, unsigned long
        EVP_PKEY *pkey;
        STACK_OF(X509_ATTRIBUTE) *sk;
        STACK_OF(X509_EXTENSION) *exts;
-       char str[128];
        char mlch = ' ';
        int nmindent = 0;
 
@@ -116,8 +117,9 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, unsigned long
                l=0;
                for (i=0; i<ri->version->length; i++)
                        { l<<=8; l+=ri->version->data[i]; }
-               sprintf(str,"%8sVersion: %s%lu (%s0x%lx)\n","",neg,l,neg,l);
-               if (BIO_puts(bp,str) <= 0) goto err;
+               if(BIO_printf(bp,"%8sVersion: %s%lu (%s0x%lx)\n","",neg,l,neg,
+                             l) <= 0)
+                   goto err;
                }
         if(!(cflag & X509_FLAG_NO_SUBJECT))
                 {
@@ -176,14 +178,14 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, unsigned long
        if(!(cflag & X509_FLAG_NO_ATTRIBUTES))
                {
                /* may not be */
-               sprintf(str,"%8sAttributes:\n","");
-               if (BIO_puts(bp,str) <= 0) goto err;
+               if(BIO_printf(bp,"%8sAttributes:\n","") <= 0)
+                   goto err;
 
                sk=x->req_info->attributes;
                if (sk_X509_ATTRIBUTE_num(sk) == 0)
                        {
-                       sprintf(str,"%12sa0:00\n","");
-                       if (BIO_puts(bp,str) <= 0) goto err;
+                       if(BIO_printf(bp,"%12sa0:00\n","") <= 0)
+                           goto err;
                        }
                else
                        {
@@ -198,8 +200,8 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, unsigned long
                                a=sk_X509_ATTRIBUTE_value(sk,i);
                                if(X509_REQ_extension_nid(OBJ_obj2nid(a->object)))
                                                                        continue;
-                               sprintf(str,"%12s","");
-                               if (BIO_puts(bp,str) <= 0) goto err;
+                               if(BIO_printf(bp,"%12s","") <= 0)
+                                   goto err;
                                if ((j=i2a_ASN1_OBJECT(bp,a->object)) > 0)
                                {
                                if (a->single)
@@ -254,7 +256,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))
                                        {