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

Move more internal only functions to asn1_locl.h 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 8fdc3734

crypto/asn1/a_bitstr.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <stdio.h>

#include "cryptlib.h"

#include <openssl/asn1.h>

#include "asn1_locl.h"



int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)

{

crypto/asn1/a_int.c

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "cryptlib.h"

#include <openssl/asn1.h>

#include <openssl/bn.h>

#include "asn1_locl.h"



ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x)

{

crypto/asn1/a_object.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include <openssl/objects.h>

#include <openssl/bn.h>

#include "internal/asn1_int.h"

#include "asn1_locl.h"



int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)

{

crypto/asn1/a_type.c

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "cryptlib.h"

#include <openssl/asn1t.h>

#include <openssl/objects.h>

#include "asn1_locl.h"



int ASN1_TYPE_get(ASN1_TYPE *a)

{
@@ -73,7 +74,7 @@ void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value) 
{

    if (a->value.ptr != NULL) {

        ASN1_TYPE **tmp_a = &a;

        ASN1_primitive_free((ASN1_VALUE **)tmp_a, NULL);

        asn1_primitive_free((ASN1_VALUE **)tmp_a, NULL);

    }

    a->type = type;

    if (type == V_ASN1_BOOLEAN)

crypto/asn1/asn1.h

+0 −8
Original line number Diff line number Diff line
@@ -595,8 +595,6 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b); 
ASN1_OBJECT *ASN1_OBJECT_new(void);

void ASN1_OBJECT_free(ASN1_OBJECT *a);

int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp);

ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,

                             long length);

ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,

                             long length);
@@ -623,9 +621,6 @@ int ASN1_STRING_type(ASN1_STRING *x); 
unsigned char *ASN1_STRING_data(ASN1_STRING *x);



DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)

int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);

ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,

                                     const unsigned char **pp, long length);

int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length);

int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);

int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n);
@@ -639,9 +634,6 @@ int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value, 
                            BIT_STRING_BITNAME *tbl);



DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)

int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);

ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,

                               long length);

ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,

                                long length);

ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x);