Recognise Ultra Sparc and compiler version number.

[oweals/openssl.git] / apps / pkcs12.c

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 266bfa89ab2a8a4a1fc1a7eab2f3cda3d9afb872..b056b8417234b1c886c595ec504e6934b299f71f 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -59,9 +59,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pem.h>
-#include <err.h>
-#include "pkcs12.h"
+#include <openssl/des.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
+#include <openssl/pkcs12.h>
 
 #include "apps.h"
 #define PROG pkcs12_main
@@ -76,26 +77,14 @@ EVP_CIPHER *enc;
 #define CLCERTS                0x8
 #define CACERTS                0x10
 
-#ifndef NOPROTO
 int get_cert_chain(X509 *cert, STACK **chain);
-int dump_certs_keys_p12(BIO *out, PKCS12 *p12, unsigned char *pass, int passlen, int options);
-int dump_certs_pkeys_bags(BIO *out, STACK *bags, unsigned char *pass, int passlen, int options);
-int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, unsigned char *pass, int passlen, int options);
+int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options);
+int dump_certs_pkeys_bags(BIO *out, STACK *bags, char *pass, int passlen, int options);
+int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options);
 int print_attribs(BIO *out, STACK *attrlst, char *name);
 void hex_prin(BIO *out, unsigned char *buf, int len);
 int alg_print(BIO *x, X509_ALGOR *alg);
 int cert_load(BIO *in, STACK *sk);
-#else
-int get_cert_chain();
-int dump_certs_keys_p12();
-int dump_certs_pkeys_bags();
-int dump_certs_pkeys_bag();
-int print_attribs();
-void hex_prin();
-int alg_print();
-int cert_load();
-#endif
-
 int MAIN(int argc, char **argv)
 {
     char *infile=NULL, *outfile=NULL, *keyname = NULL; 
@@ -274,7 +263,7 @@ if (export_cert) {
        char *catmp;
        int i, pmatch = 0;
        unsigned char keyid[EVP_MAX_MD_SIZE];
-       int keyidlen;
+       unsigned int keyidlen;
        /* Get private key so we can match it to a certificate */
        key = PEM_read_bio_PrivateKey(inkey ? inkey : in, NULL, NULL);
        if (!inkey) BIO_reset(in);
@@ -452,7 +441,7 @@ int dump_cert_text (BIO *out, X509 *x)
         return 0;
 }
 
-int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, unsigned char *pass,
+int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
             int passlen, int options)
 {
        STACK *asafes, *bags;
@@ -485,7 +474,7 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, unsigned char *pass,
        return 1;
 }
 
-int dump_certs_pkeys_bags (BIO *out, STACK *bags, unsigned char *pass,
+int dump_certs_pkeys_bags (BIO *out, STACK *bags, char *pass,
             int passlen, int options)
 {
        int i;
@@ -497,7 +486,7 @@ int dump_certs_pkeys_bags (BIO *out, STACK *bags, unsigned char *pass,
        return 1;
 }
 
-int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, unsigned char *pass,
+int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
             int passlen, int options)
 {
        EVP_PKEY *pkey;
@@ -649,8 +638,8 @@ int print_attribs (BIO *out, STACK *attrlst, char *name)
                        BIO_printf(out, ": ");
                } else BIO_printf(out, "%s: ", OBJ_nid2ln(attr_nid));
 
-               if(sk_num(attr->value.set)) {
-                       av = (ASN1_TYPE *)sk_value(attr->value.set, 0);
+               if(sk_ASN1_TYPE_num(attr->value.set)) {
+                       av = sk_ASN1_TYPE_value(attr->value.set, 0);
                        switch(av->type) {
                                case V_ASN1_BMPSTRING:
                                value = uni2asc(av->value.bmpstring->data,