1 files changed, 60 insertions, 52 deletions

diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c
index 7df749a48f..848c29a2dd 100644
--- a/src/lib/libcrypto/asn1/t_req.c
+++ b/src/lib/libcrypto/asn1/t_req.c
@@ -58,15 +58,14 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "bn.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/buffer.h>
+#include <openssl/bn.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
-#ifndef NO_FP_API
-int X509_REQ_print_fp(fp,x)
-FILE *fp;
-X509_REQ *x;
+#ifndef OPENSSL_NO_FP_API
+int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
         {
         BIO *b;
         int ret;
@@ -83,16 +82,15 @@ X509_REQ *x;
         }
 #endif
 
-int X509_REQ_print(bp,x)
-BIO *bp;
-X509_REQ *x;
+int X509_REQ_print(BIO *bp, X509_REQ *x)
         {
         unsigned long l;
-        int i,n;
-        char *s,*neg;
+        int i;
+        const char *neg;
         X509_REQ_INFO *ri;
         EVP_PKEY *pkey;
-        STACK *sk;
+        STACK_OF(X509_ATTRIBUTE) *sk;
+        STACK_OF(X509_EXTENSION) *exts;
         char str[128];
 
         ri=x->req_info;
@@ -119,8 +117,8 @@ X509_REQ *x;
         if (BIO_puts(bp,str) <= 0) goto err;
 
         pkey=X509_REQ_get_pubkey(x);
-#ifndef NO_RSA
-        if (pkey->type == EVP_PKEY_RSA)
+#ifndef OPENSSL_NO_RSA
+        if (pkey != NULL && pkey->type == EVP_PKEY_RSA)
                 {
                 BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","",
                         BN_num_bits(pkey->pkey.rsa->n));
@@ -128,8 +126,8 @@ X509_REQ *x;
                 }
         else 
 #endif
-#ifndef NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
+#ifndef OPENSSL_NO_DSA
+                if (pkey != NULL && pkey->type == EVP_PKEY_DSA)
                 {
                 BIO_printf(bp,"%12sDSA Public Key:\n","");
                 DSA_print(bp,pkey->pkey.dsa,16);
@@ -138,22 +136,22 @@ X509_REQ *x;
 #endif
                 BIO_printf(bp,"%12sUnknown Public Key:\n","");
 
+        if (pkey != NULL)
+            EVP_PKEY_free(pkey);
+
         /* may not be */
         sprintf(str,"%8sAttributes:\n","");
         if (BIO_puts(bp,str) <= 0) goto err;
 
         sk=x->req_info->attributes;
-        if ((sk == NULL) || (sk_num(sk) == 0))
+        if (sk_X509_ATTRIBUTE_num(sk) == 0)
                 {
-                if (!x->req_info->req_kludge)
-                        {
-                        sprintf(str,"%12sa0:00\n","");
-                        if (BIO_puts(bp,str) <= 0) goto err;
-                        }
+                sprintf(str,"%12sa0:00\n","");
+                if (BIO_puts(bp,str) <= 0) goto err;
                 }
         else
                 {
-                for (i=0; i<sk_num(sk); i++)
+                for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
                         {
                         ASN1_TYPE *at;
                         X509_ATTRIBUTE *a;
@@ -161,26 +159,29 @@ X509_REQ *x;
                         ASN1_TYPE *t;
                         int j,type=0,count=1,ii=0;
 
-                        a=(X509_ATTRIBUTE *)sk_value(sk,i);
+                        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 ((j=i2a_ASN1_OBJECT(bp,a->object)) > 0)
-
-                        if (a->set)
+                        {
+                        if (a->single)
+                                {
+                                t=a->value.single;
+                                type=t->type;
+                                bs=t->value.bit_string;
+                                }
+                        else
                                 {
                                 ii=0;
-                                count=sk_num(a->value.set);
+                                count=sk_ASN1_TYPE_num(a->value.set);
 get_next:
-                                at=(ASN1_TYPE *)sk_value(a->value.set,ii);
+                                at=sk_ASN1_TYPE_value(a->value.set,ii);
                                 type=at->type;
                                 bs=at->value.asn1_string;
                                 }
-                        else
-                                {
-                                t=a->value.single;
-                                type=t->type;
-                                bs=t->value.bit_string;
-                                }
+                        }
                         for (j=25-j; j>0; j--)
                                 if (BIO_write(bp," ",1) != 1) goto err;
                         if (BIO_puts(bp,":") <= 0) goto err;
@@ -201,24 +202,31 @@ get_next:
                         }
                 }
 
-        i=OBJ_obj2nid(x->sig_alg->algorithm);
-        sprintf(str,"%4sSignature Algorithm: %s","",
-                (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i));
-        if (BIO_puts(bp,str) <= 0) goto err;
-
-        n=x->signature->length;
-        s=(char *)x->signature->data;
-        for (i=0; i<n; i++)
-                {
-                if ((i%18) == 0)
-                        {
-                        sprintf(str,"\n%8s","");
-                        if (BIO_puts(bp,str) <= 0) goto err;
+        exts = X509_REQ_get_extensions(x);
+        if(exts) {
+                BIO_printf(bp,"%8sRequested Extensions:\n","");
+                for (i=0; i<sk_X509_EXTENSION_num(exts); i++) {
+                        ASN1_OBJECT *obj;
+                        X509_EXTENSION *ex;
+                        int j;
+                        ex=sk_X509_EXTENSION_value(exts, i);
+                        if (BIO_printf(bp,"%12s","") <= 0) goto err;
+                        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)
+                                goto err;
+                        if(!X509V3_EXT_print(bp, ex, 0, 16)) {
+                                BIO_printf(bp, "%16s", "");
+                                M_ASN1_OCTET_STRING_print(bp,ex->value);
                         }
-                sprintf(str,"%02x%s",(unsigned char)s[i],((i+1) == n)?"":":");
-                if (BIO_puts(bp,str) <= 0) goto err;
+                        if (BIO_write(bp,"\n",1) <= 0) goto err;
                 }
-        if (BIO_puts(bp,"\n") <= 0) goto err;
+                sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
+        }
+
+        if(!X509_signature_print(bp, x->sig_alg, x->signature)) goto err;
+
         return(1);
 err:
         X509err(X509_F_X509_REQ_PRINT,ERR_R_BUF_LIB);