DECLARE_STACK_OF was renamed to DEFINE_STACK_OF in commit
8588571.
Expanded the only use of TYPEDEF_{D2I,I2D,D2I2D}_OF, so that they can
easily be removed in a future release
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10464)
# define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(const type *,unsigned char **)
# define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
# define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(const type *,unsigned char **)
# define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
+typedef void *d2i_of_void(void **, const unsigned char **, long);
+typedef int i2d_of_void(const void *, unsigned char **);
/*-
* The following macros and typedefs allow an ASN1_ITEM
/*-
* The following macros and typedefs allow an ASN1_ITEM
s/[\n\s]*$//g;
# Skip over recognized non-function declarations
s/[\n\s]*$//g;
# Skip over recognized non-function declarations
- next if /typedef\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/;
# Remove STACK_OF(foo)
s/STACK_OF\(\w+\)/void/;
# Remove STACK_OF(foo)
s/STACK_OF\(\w+\)/void/;
{ regexp => qr/DEFINE_STACK_OF_CONST<<<\((.*)\)>>>/,
massager => sub { return ("SKM_DEFINE_STACK_OF($1,const $1,$1)"); },
},
{ regexp => qr/DEFINE_STACK_OF_CONST<<<\((.*)\)>>>/,
massager => sub { return ("SKM_DEFINE_STACK_OF($1,const $1,$1)"); },
},
- { regexp => qr/PREDECLARE_STACK_OF<<<\((.*)\)>>>/,
- massager => sub { return ("STACK_OF($1);"); }
- },
- { regexp => qr/DECLARE_STACK_OF<<<\((.*)\)>>>/,
- massager => sub { return ("STACK_OF($1);"); }
- },
- { regexp => qr/DECLARE_SPECIAL_STACK_OF<<<\((.*?),\s*(.*?)\)>>>/,
- massager => sub { return ("STACK_OF($1);"); }
- },
-
- { regexp => qr/TYPEDEF_D2I_OF<<<\((.*)\)>>>/,
- massager => sub {
- return ("typedef $1 *d2i_of_$1($1 **,const unsigned char **,long)");
- },
- },
- { regexp => qr/TYPEDEF_I2D_OF<<<\((.*)\)>>>/,
- massager => sub {
- return ("typedef $1 *i2d_of_$1($1 *,unsigned char **)");
- },
- },
- { regexp => qr/TYPEDEF_D2I2D_OF<<<\((.*)\)>>>/,
- massager => sub {
- return ("TYPEDEF_D2I_OF($1); TYPEDEF_I2D_OF($1)");
- },
- },
{ regexp => qr/DECLARE_ASN1_ITEM<<<\((.*)\)>>>/,
massager => sub {
return (<<"EOF");
{ regexp => qr/DECLARE_ASN1_ITEM<<<\((.*)\)>>>/,
massager => sub {
return (<<"EOF");