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

Fix declarations and constification for inline stack. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 411abf2d

apps/ciphers.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int ciphers_main(int argc, char **argv) 


    if (!verbose) {

        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {

            SSL_CIPHER *c = sk_SSL_CIPHER_value(sk, i);

            const SSL_CIPHER *c = sk_SSL_CIPHER_value(sk, i);

            p = SSL_CIPHER_get_name(c);

            if (p == NULL)

                break;
@@ -212,7 +212,7 @@ int ciphers_main(int argc, char **argv) 
    } else {



        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {

            SSL_CIPHER *c;

            const SSL_CIPHER *c;



            c = sk_SSL_CIPHER_value(sk, i);

crypto/asn1/ameth_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { 
};



typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);

DECLARE_STACK_OF(EVP_PKEY_ASN1_METHOD)

DECLARE_CONST_STACK_OF(EVP_PKEY_ASN1_METHOD)

static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;



#ifdef TEST

crypto/cms/cms_env.c

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ 


/* CMS EnvelopedData Utilities */



DECLARE_STACK_OF(CMS_RecipientInfo)



CMS_EnvelopedData *cms_get0_enveloped(CMS_ContentInfo *cms)

{

    if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_enveloped) {

crypto/cms/cms_lcl.h

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ struct CMS_ContentInfo_st { 
    } d;

};



DECLARE_STACK_OF(CMS_CertificateChoices)



struct CMS_SignedData_st {

    long version;

    STACK_OF(X509_ALGOR) *digestAlgorithms;

crypto/cms/cms_lib.c

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ 
IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo)

IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo)



DECLARE_STACK_OF(CMS_CertificateChoices)

DECLARE_STACK_OF(CMS_RevocationInfoChoice)



const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms)

{

    return cms->contentType;