Tidy up CRYPTO_EX_DATA structures.

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

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 5caee74c5e503e40ccc7e41bc8bd25105a1cca9e..81dd6355a887368e496fb4b4b2a2e562dcebe801 100644 (file)
--- a/crypto/asn1/t_req.c
+++ b/crypto/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;
+int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
         {
         BIO *b;
         int ret;
@@ -83,16 +82,16 @@ 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;
+       char *s;
+       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;
@@ -145,7 +144,7 @@ X509_REQ *x;
        if (BIO_puts(bp,str) <= 0) goto err;
 
        sk=x->req_info->attributes;
-       if ((sk == NULL) || (sk_num(sk) == 0))
+       if ((sk == NULL) || (sk_X509_ATTRIBUTE_num(sk) == 0))
                {
                if (!x->req_info->req_kludge)
                        {
@@ -155,7 +154,7 @@ X509_REQ *x;
                }
        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;
@@ -163,17 +162,19 @@ 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)
                                {
                                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;
                                }
@@ -183,6 +184,7 @@ get_next:
                                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;
@@ -203,6 +205,29 @@ get_next:
                        }
                }
 
+       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);
+                       }
+                       if (BIO_write(bp,"\n",1) <= 0) goto err;
+               }
+               sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
+       }
+
        i=OBJ_obj2nid(x->sig_alg->algorithm);
        sprintf(str,"%4sSignature Algorithm: %s","",
                (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i));