Merge remote-tracking branch 'origin/generic_objects'

2015-12-21 10:42:38 +01:00
parent e71c3b5337 ab68b53b5c
commit abcce21353
9 changed files with 251 additions and 23 deletions
@@ -40,7 +40,8 @@
 #define INPUT 1
 #define OUTPUT 2

-void dump_hex(unsigned const char*, unsigned int, FILE*, bool);
+size_t read_data(unsigned char*, size_t, FILE*, enum enum_format);
+void dump_data(unsigned const char*, unsigned int, FILE*, bool, enum enum_format);
 int set_length(unsigned char*, int);
 int get_length(const unsigned char*, int*);
 X509_NAME *parse_name(const char*);