Commit a657546f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files 

New ASN1_STRING_print_ex() and X509_NAME_print_ex()
functions. These are intended to be replacements
for the ancient ASN1_STRING_print() and X509_NAME_print()
functions.

The new functions support RFC2253 and various pretty
printing options. It is also possible to display
international characters if the terminal properly handles
UTF8 encoding (Linux seems to tolerate this if the
"unicode_start" script is run).

Still needs to be documented, integrated into other
utilities and extensively tested.
parent 8083e1bd

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ 
     BIO_dump_indent() are added.

     [Richard Levitte]



  *) New functions ASN1_STRING_print_ex() and X509_NAME_print_ex()

     these print out strings and name structures based on various

     flags including RFC2253 support and proper handling of

     multibyte characters. Added options to the 'x509' utility 

     to allow the various flags to be set.

     [Steve Henson]



  *) Various fixes to use ASN1_TIME instead of ASN1_UTCTIME.

     Also change the functions X509_cmp_current_time() and

     X509_gmtime_adj() work with an ASN1_TIME structure,

apps/apps.c

+80 −0
Original line number Diff line number Diff line
@@ -653,3 +653,83 @@ end: 
	return(othercerts);

	}



typedef struct {

	char *name;

	unsigned long flag;

	unsigned long mask;

} NAME_EX_TBL;



int set_name_ex(unsigned long *flags, const char *arg)

{

	char c;

	const NAME_EX_TBL *ptbl, ex_tbl[] = {

		{ "esc_2253", ASN1_STRFLGS_ESC_2253, 0},

		{ "esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0},

		{ "esc_msb", ASN1_STRFLGS_ESC_MSB, 0},

		{ "use_quote", ASN1_STRFLGS_ESC_QUOTE, 0},

		{ "utf8", ASN1_STRFLGS_UTF8_CONVERT, 0},

		{ "no_type", ASN1_STRFLGS_IGNORE_TYPE, 0},

		{ "show_name", ASN1_STRFLGS_SHOW_NAME, 0},

		{ "dump_all", ASN1_STRFLGS_DUMP_ALL, 0},

		{ "dump_nostr", ASN1_STRFLGS_DUMP_UNKNOWN, 0},

		{ "dump_der", ASN1_STRFLGS_DUMP_DER, 0},

		{ "compat", XN_FLAG_COMPAT, 0xffffffffL},

		{ "sep_comma_plus", XN_FLAG_SEP_COMMA_PLUS, XN_FLAG_SEP_MASK},

		{ "sep_comma_plus_space", XN_FLAG_SEP_CPLUS_SPC, XN_FLAG_SEP_MASK},

		{ "sep_semi_plus_space", XN_FLAG_SEP_SPLUS_SPC, XN_FLAG_SEP_MASK},

		{ "sep_multiline", XN_FLAG_SEP_MULTILINE, XN_FLAG_SEP_MASK},

		{ "dn_rev", XN_FLAG_DN_REV, 0},

		{ "nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK},

		{ "sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK},

		{ "lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK},

		{ "oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK},

		{ "space_eq", XN_FLAG_SPC_EQ, 0},

		{ "dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0},

		{ "RFC2253", XN_FLAG_RFC2253, 0xffffffffL},

		{ "oneline", XN_FLAG_ONELINE, 0xffffffffL},

		{ "multiline", XN_FLAG_MULTILINE, 0xffffffffL},

		{ NULL, 0, 0}

	};



	c = arg[0];



	if(c == '-') {

		c = 0;

		arg++;

	} else if (c == '+') {

		c = 1;

		arg++;

	} else c = 1;



	for(ptbl = ex_tbl; ptbl->name; ptbl++) {

		if(!strcmp(arg, ptbl->name)) {

			*flags &= ~ptbl->mask;

			if(c) *flags |= ptbl->flag;

			else *flags &= ~ptbl->flag;

			return 1;

		}

	}

	return 0;

}



void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)

{

	char buf[256];

	char mline = 0;

	int indent = 0;

	if(title) BIO_puts(out, title);

	if((lflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {

		mline = 1;

		indent = 4;

	}

	if(lflags == XN_FLAG_COMPAT) {

		X509_NAME_oneline(nm,buf,256);

		BIO_puts(out,buf);

		BIO_puts(out, "\n");

	} else {

		if(mline) BIO_puts(out, "\n");

		X509_NAME_print_ex(out, nm, indent, lflags);

		BIO_puts(out, "\n");

	}

}

apps/apps.h

+2 −0
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ void program_name(char *in,char *out,int size); 
int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]);

#ifdef HEADER_X509_H

int dump_cert_text(BIO *out, X509 *x);

void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags);

#endif

int set_name_ex(unsigned long *flags, const char *arg);

int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);

int add_oid_section(BIO *err, LHASH *conf);

X509 *load_cert(BIO *err, char *file, int format);

apps/x509.c

+14 −12
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static char *x509_usage[]={ 
" -extfile        - configuration file with X509V3 extensions to add\n",

" -extensions     - section from config file with X509V3 extensions to add\n",

" -clrext         - delete extensions before signing and input certificate\n",

" -nameopt arg    - various certificate name options\n",

NULL

};
@@ -173,6 +174,7 @@ int MAIN(int argc, char **argv) 
	char *extsect = NULL, *extfile = NULL, *passin = NULL, *passargin = NULL;

	int need_rand = 0;

	int checkend=0,checkoffset=0;

	unsigned long nmflag = 0;



	reqfile=0;
@@ -316,6 +318,11 @@ int MAIN(int argc, char **argv) 
			alias= *(++argv);

			trustout = 1;

			}

		else if (strcmp(*argv,"-nameopt") == 0)

			{

			if (--argc < 1) goto bad;

			if(!set_name_ex(&nmflag, *(++argv))) goto bad;

			}

		else if (strcmp(*argv,"-setalias") == 0)

			{

			if (--argc < 1) goto bad;
@@ -525,8 +532,7 @@ bad: 
		else

			BIO_printf(bio_err,"Signature ok\n");



		X509_NAME_oneline(req->req_info->subject,buf,256);

		BIO_printf(bio_err,"subject=%s\n",buf);

		print_name(bio_err, "subject=", X509_REQ_get_subject_name(req), nmflag);



		if ((x=X509_new()) == NULL) goto end;

		ci=x->cert_info;
@@ -600,15 +606,13 @@ bad: 
			{

			if (issuer == i)

				{

				X509_NAME_oneline(X509_get_issuer_name(x),

					buf,256);

				BIO_printf(STDout,"issuer= %s\n",buf);

				print_name(STDout, "issuer= ",

					X509_get_issuer_name(x), nmflag);

				}

			else if (subject == i) 

				{

				X509_NAME_oneline(X509_get_subject_name(x),

					buf,256);

				BIO_printf(STDout,"subject=%s\n",buf);

				print_name(STDout, "issuer= ",

					X509_get_subject_name(x), nmflag);

				}

			else if (serial == i)

				{
@@ -1082,7 +1086,6 @@ end: 


static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx)

	{

	char buf[256];

	int err;

	X509 *err_cert;
@@ -1104,8 +1107,7 @@ static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx) 
	else

		{

		err_cert=X509_STORE_CTX_get_current_cert(ctx);

		X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256);

		BIO_printf(bio_err,"%s\n",buf);

		print_name(bio_err, NULL, X509_get_subject_name(err_cert),0);

		BIO_printf(bio_err,"error with certificate - error %d at depth %d\n%s\n",

			err,X509_STORE_CTX_get_error_depth(ctx),

			X509_verify_cert_error_string(err));

crypto/asn1/Makefile.ssl

+19 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ APPS= 
LIB=$(TOP)/libcrypto.a

LIBSRC=	a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \

	a_null.c a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c a_bmp.c \

	a_enum.c a_vis.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c \

	a_enum.c a_vis.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \

	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c \

	x_name.c x_cinf.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \

	d2i_r_pr.c i2d_r_pr.c d2i_r_pu.c i2d_r_pu.c \
@@ -39,7 +39,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ 
	evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c

LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \

	a_null.o a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o a_bmp.o \

	a_enum.o a_vis.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o \

	a_enum.o a_vis.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \

	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_attrib.o \

	x_name.o x_cinf.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \

	d2i_r_pr.o i2d_r_pr.o d2i_r_pu.o i2d_r_pu.o \
@@ -284,6 +284,23 @@ a_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 
a_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

a_sign.o: ../cryptlib.h

a_strex.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

a_strex.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

a_strex.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

a_strex.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

a_strex.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

a_strex.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h

a_strex.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h

a_strex.o: ../../include/openssl/md2.h ../../include/openssl/md5.h

a_strex.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h

a_strex.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

a_strex.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

a_strex.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

a_strex.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

a_strex.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

a_strex.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

a_strex.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

a_strex.o: charmap.h

a_strnid.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

a_strnid.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

a_strnid.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h