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

Initial support for ASN1 print code. 

WARNING WARNING WARNING, experimental code, handle with care, use at
your own risk, may contain nuts.
parent a0156a92

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.8a and 0.9.9  [xx XXX xxxx]



  *) Very, very preliminary EXPERIMENTAL support for printing of general

     ASN1 structures. This currently produces rather ugly output and doesn't

     handle several customised structures at all.

     [Steve Henson]



  *) Integrated support for PVK file format and some related formats such

     as MS PUBLICKEYBLOB and PRIVATEKEYBLOB. Command line switches to support

     these in the 'rsa' and 'dsa' utilities.

crypto/asn1/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ 
	x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\

	t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \

	tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \

	tasn_prn.c \

	f_int.c f_string.c n_pkey.c \

	f_enum.c x_pkey.c a_bool.c x_exten.c \

	asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c \
@@ -37,6 +38,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ 
	x_nx509.o d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \

	t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \

	tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \

	tasn_prn.o \

	f_int.o f_string.o n_pkey.o \

	f_enum.o x_pkey.o a_bool.o x_exten.o \

	asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_bytes.o a_strnid.o \

crypto/asn1/asn1.h

+35 −1
Original line number Diff line number Diff line
@@ -990,6 +990,40 @@ void ASN1_add_oid_module(void); 
ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf);

ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);



/* ASN1 Print flags */



/* Indicate missing OPTIONAL fields */

#define ASN1_PCTX_FLAGS_SHOW_ABSENT		0x001	

/* Mark start and end of SEQUENCE */

#define ASN1_PCTX_FLAGS_SHOW_SEQUENCE		0x002

/* Mark start and end of SEQUENCE/SET OF */

#define ASN1_PCTX_FLAGS_SHOW_SSOF		0x004

/* Show the ASN1 type of primitives */

#define ASN1_PCTX_FLAGS_SHOW_TYPE		0x008

/* Don't show ASN1 type of ANY */

#define ASN1_PCTX_FLAGS_NO_ANY_TYPE		0x010

/* Don't show ASN1 type of MSTRINGs */

#define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE		0x020

/* Don't show field names in SEQUENCE */

#define ASN1_PCTX_FLAGS_NO_FIELD_NAME		0x040

/* Show structure names of each SEQUENCE field */

#define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME	0x080

/* Don't show structure name even at top level */

#define ASN1_PCTX_FLAGS_NO_STRUCT_NAME		0x100



ASN1_PCTX *ASN1_PCTX_new(void);

void ASN1_PCTX_free(ASN1_PCTX *p);

unsigned long ASN1_PCTX_get_flags(ASN1_PCTX *p);

void ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags);

unsigned long ASN1_PCTX_get_nm_flags(ASN1_PCTX *p);

void ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags);

unsigned long ASN1_PCTX_get_cert_flags(ASN1_PCTX *p);

void ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags);

unsigned long ASN1_PCTX_get_oid_flags(ASN1_PCTX *p);

void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);

unsigned long ASN1_PCTX_get_str_flags(ASN1_PCTX *p);

void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);



/* BEGIN ERROR CODES */

/* The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.

crypto/asn1/asn1t.h

+5 −0
Original line number Diff line number Diff line
@@ -644,6 +644,10 @@ typedef int ASN1_ex_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM 
typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it);

typedef void ASN1_ex_free_func(ASN1_VALUE **pval, const ASN1_ITEM *it);



typedef int ASN1_ex_print_func(BIO *out, ASN1_VALUE **pval, 

						int indent, const char *fname, 

						const ASN1_PCTX *pctx);



typedef int ASN1_primitive_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, const ASN1_ITEM *it);

typedef int ASN1_primitive_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype, char *free_cont, const ASN1_ITEM *it);
@@ -661,6 +665,7 @@ typedef struct ASN1_EXTERN_FUNCS_st { 
	ASN1_ex_free_func *asn1_ex_clear;

	ASN1_ex_d2i *asn1_ex_d2i;

	ASN1_ex_i2d *asn1_ex_i2d;

	ASN1_ex_print_func *asn1_ex_print;

} ASN1_EXTERN_FUNCS;



typedef struct ASN1_PRIMITIVE_FUNCS_st {

crypto/asn1/tasn_prn.c

+0 −20
Original line number Diff line number Diff line
@@ -67,26 +67,6 @@ 
#include "asn1_locl.h"



#include <string.h>

/* Print flags */



/* Indicate missing OPTIONAL fields */

#define ASN1_PCTX_FLAGS_SHOW_ABSENT		0x001	

/* Mark start and end of SEQUENCE */

#define ASN1_PCTX_FLAGS_SHOW_SEQUENCE		0x002

/* Mark start and end of SEQUENCE/SET OF */

#define ASN1_PCTX_FLAGS_SHOW_SSOF		0x004

/* Show the ASN1 type of primitives */

#define ASN1_PCTX_FLAGS_SHOW_TYPE		0x008

/* Don't show ASN1 type of ANY */

#define ASN1_PCTX_FLAGS_NO_ANY_TYPE		0x010

/* Don't show ASN1 type of MSTRINGs */

#define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE		0x020

/* Don't show field names in SEQUENCE */

#define ASN1_PCTX_FLAGS_NO_FIELD_NAME		0x040

/* Show structure names of each SEQUENCE field */

#define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME	0x080

/* Don't show structure name even at top level */

#define ASN1_PCTX_FLAGS_NO_STRUCT_NAME		0x100



/* Print routines.

 */