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

Remove deleted functions, update ordinals. 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 564df0dd

crypto/asn1/asn1.h

+0 −20
Original line number Diff line number Diff line
@@ -747,14 +747,7 @@ BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn); 
/* given a string, return the correct type, max is the maximum length */

int ASN1_PRINTABLE_type(const unsigned char *s, int max);



int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);

ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,

                            long length, int Ptag, int Pclass);

unsigned long ASN1_tag2bit(int tag);

/* type is one or more of the B_ASN1_ values. */

ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,

                                 long length, int type);



/* PARSING */

int asn1_Finish(ASN1_CTX *c);

int asn1_const_Finish(ASN1_const_CTX *c);
@@ -865,20 +858,7 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, 
int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,

                                  unsigned char *data, int max_len);



STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,

                                         d2i_of_void *d2i,

                                         void (*free_func) (OPENSSL_BLOCK));

unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,

                             unsigned char **buf, int *len);

void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);

void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);

ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,

                              ASN1_OCTET_STRING **oct);



# define ASN1_pack_string_of(type,obj,i2d,oct) \

    (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \

                      CHECKED_I2D_OF(type, i2d), \

                      oct))



ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,

                            ASN1_OCTET_STRING **oct);

util/libeay.num

+11 −11
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ BN_usub 709 EXIST::FUNCTION: 
bn_sqr_words                            710	NOEXIST::FUNCTION:

_ossl_old_crypt                         711	NOEXIST::FUNCTION:

d2i_ASN1_BIT_STRING                     712	EXIST::FUNCTION:

d2i_ASN1_BOOLEAN                        713	EXIST::FUNCTION:

d2i_ASN1_BOOLEAN                        713	NOEXIST::FUNCTION:

d2i_ASN1_HEADER                         714	NOEXIST::FUNCTION:

d2i_ASN1_IA5STRING                      715	EXIST::FUNCTION:

d2i_ASN1_INTEGER                        716	EXIST::FUNCTION:
@@ -711,12 +711,12 @@ d2i_ASN1_OBJECT 717 EXIST::FUNCTION: 
d2i_ASN1_OCTET_STRING                   718	EXIST::FUNCTION:

d2i_ASN1_PRINTABLE                      719	EXIST::FUNCTION:

d2i_ASN1_PRINTABLESTRING                720	EXIST::FUNCTION:

d2i_ASN1_SET                            721	EXIST::FUNCTION:

d2i_ASN1_SET                            721	NOEXIST::FUNCTION:

d2i_ASN1_T61STRING                      722	EXIST::FUNCTION:

d2i_ASN1_TYPE                           723	EXIST::FUNCTION:

d2i_ASN1_UTCTIME                        724	EXIST::FUNCTION:

d2i_ASN1_bytes                          725	EXIST::FUNCTION:

d2i_ASN1_type_bytes                     726	EXIST::FUNCTION:

d2i_ASN1_bytes                          725	NOEXIST::FUNCTION:

d2i_ASN1_type_bytes                     726	NOEXIST::FUNCTION:

d2i_DHparams                            727	EXIST::FUNCTION:DH

d2i_DSAPrivateKey                       728	EXIST::FUNCTION:DSA

d2i_DSAPrivateKey_bio                   729	EXIST::FUNCTION:DSA
@@ -808,17 +808,17 @@ i2a_ASN1_INTEGER 815 EXIST::FUNCTION: 
i2a_ASN1_OBJECT                         816	EXIST::FUNCTION:

i2a_ASN1_STRING                         817	EXIST::FUNCTION:

i2d_ASN1_BIT_STRING                     818	EXIST::FUNCTION:

i2d_ASN1_BOOLEAN                        819	EXIST::FUNCTION:

i2d_ASN1_BOOLEAN                        819	NOEXIST::FUNCTION:

i2d_ASN1_HEADER                         820	NOEXIST::FUNCTION:

i2d_ASN1_IA5STRING                      821	EXIST::FUNCTION:

i2d_ASN1_INTEGER                        822	EXIST::FUNCTION:

i2d_ASN1_OBJECT                         823	EXIST::FUNCTION:

i2d_ASN1_OCTET_STRING                   824	EXIST::FUNCTION:

i2d_ASN1_PRINTABLE                      825	EXIST::FUNCTION:

i2d_ASN1_SET                            826	EXIST::FUNCTION:

i2d_ASN1_SET                            826	NOEXIST::FUNCTION:

i2d_ASN1_TYPE                           827	EXIST::FUNCTION:

i2d_ASN1_UTCTIME                        828	EXIST::FUNCTION:

i2d_ASN1_bytes                          829	EXIST::FUNCTION:

i2d_ASN1_bytes                          829	NOEXIST::FUNCTION:

i2d_DHparams                            830	EXIST::FUNCTION:DH

i2d_DSAPrivateKey                       831	EXIST::FUNCTION:DSA

i2d_DSAPrivateKey_bio                   832	EXIST::FUNCTION:DSA
@@ -1231,10 +1231,10 @@ i2d_AUTHORITY_KEYID 1254 EXIST::FUNCTION: 
d2i_AUTHORITY_KEYID                     1255	EXIST::FUNCTION:

AUTHORITY_KEYID_new                     1256	EXIST::FUNCTION:

AUTHORITY_KEYID_free                    1257	EXIST::FUNCTION:

ASN1_seq_unpack                         1258	EXIST::FUNCTION:

ASN1_seq_pack                           1259	EXIST::FUNCTION:

ASN1_unpack_string                      1260	EXIST::FUNCTION:

ASN1_pack_string                        1261	EXIST::FUNCTION:

ASN1_seq_unpack                         1258	NOEXIST::FUNCTION:

ASN1_seq_pack                           1259	NOEXIST::FUNCTION:

ASN1_unpack_string                      1260	NOEXIST::FUNCTION:

ASN1_pack_string                        1261	NOEXIST::FUNCTION:

PKCS12_pack_safebag                     1262	NOEXIST::FUNCTION:

PKCS12_MAKE_KEYBAG                      1263	EXIST::FUNCTION:

PKCS8_encrypt                           1264	EXIST::FUNCTION: