Commit 6a32a3c0 authored by Richard Levitte's avatar Richard Levitte
Browse files

Act on deprecation of LONG and ZLONG, step 2 



Replace all remaining uses of LONG and ZLONG with INT32 / ZINT32.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3126)
parent 31ae5161

crypto/asn1/evp_asn1.c

+2 −2
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_l 
}



typedef struct {

    long num;

    int32_t num;

    ASN1_OCTET_STRING *oct;

} asn1_int_oct;



ASN1_SEQUENCE(asn1_int_oct) = {

        ASN1_SIMPLE(asn1_int_oct, num, LONG),

        ASN1_SIMPLE(asn1_int_oct, num, INT32),

        ASN1_SIMPLE(asn1_int_oct, oct, ASN1_OCTET_STRING)

} static_ASN1_SEQUENCE_END(asn1_int_oct)

crypto/asn1/n_pkey.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ NON_EMPTY_TRANSLATION_UNIT 
# ifndef OPENSSL_NO_RC4



typedef struct netscape_pkey_st {

    long version;

    int32_t version;

    X509_ALGOR *algor;

    ASN1_OCTET_STRING *private_key;

} NETSCAPE_PKEY;
@@ -48,7 +48,7 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY,NETSCAPE_ENCRYPTED_P 
IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY)



ASN1_SEQUENCE(NETSCAPE_PKEY) = {

        ASN1_SIMPLE(NETSCAPE_PKEY, version, LONG),

        ASN1_SIMPLE(NETSCAPE_PKEY, version, INT32),

        ASN1_SIMPLE(NETSCAPE_PKEY, algor, X509_ALGOR),

        ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING)

} static_ASN1_SEQUENCE_END(NETSCAPE_PKEY)

crypto/cms/cms_asn1.c

+13 −13
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
}



ASN1_SEQUENCE_cb(CMS_SignerInfo, cms_si_cb) = {

        ASN1_SIMPLE(CMS_SignerInfo, version, LONG),

        ASN1_SIMPLE(CMS_SignerInfo, version, INT32),

        ASN1_SIMPLE(CMS_SignerInfo, sid, CMS_SignerIdentifier),

        ASN1_SIMPLE(CMS_SignerInfo, digestAlgorithm, X509_ALGOR),

        ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, signedAttrs, X509_ATTRIBUTE, 0),
@@ -76,7 +76,7 @@ ASN1_CHOICE(CMS_RevocationInfoChoice) = { 
} ASN1_CHOICE_END(CMS_RevocationInfoChoice)



ASN1_NDEF_SEQUENCE(CMS_SignedData) = {

        ASN1_SIMPLE(CMS_SignedData, version, LONG),

        ASN1_SIMPLE(CMS_SignedData, version, INT32),

        ASN1_SET_OF(CMS_SignedData, digestAlgorithms, X509_ALGOR),

        ASN1_SIMPLE(CMS_SignedData, encapContentInfo, CMS_EncapsulatedContentInfo),

        ASN1_IMP_SET_OF_OPT(CMS_SignedData, certificates, CMS_CertificateChoices, 0),
@@ -96,7 +96,7 @@ ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = { 
} static_ASN1_NDEF_SEQUENCE_END(CMS_EncryptedContentInfo)



ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = {

        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, version, LONG),

        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, version, INT32),

        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, rid, CMS_SignerIdentifier),

        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),

        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
@@ -162,7 +162,7 @@ static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
}



ASN1_SEQUENCE_cb(CMS_KeyAgreeRecipientInfo, cms_kari_cb) = {

        ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, version, LONG),

        ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, version, INT32),

        ASN1_EXP(CMS_KeyAgreeRecipientInfo, originator, CMS_OriginatorIdentifierOrKey, 0),

        ASN1_EXP_OPT(CMS_KeyAgreeRecipientInfo, ukm, ASN1_OCTET_STRING, 1),

        ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
@@ -176,14 +176,14 @@ ASN1_SEQUENCE(CMS_KEKIdentifier) = { 
} static_ASN1_SEQUENCE_END(CMS_KEKIdentifier)



ASN1_SEQUENCE(CMS_KEKRecipientInfo) = {

        ASN1_SIMPLE(CMS_KEKRecipientInfo, version, LONG),

        ASN1_SIMPLE(CMS_KEKRecipientInfo, version, INT32),

        ASN1_SIMPLE(CMS_KEKRecipientInfo, kekid, CMS_KEKIdentifier),

        ASN1_SIMPLE(CMS_KEKRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),

        ASN1_SIMPLE(CMS_KEKRecipientInfo, encryptedKey, ASN1_OCTET_STRING)

} ASN1_SEQUENCE_END(CMS_KEKRecipientInfo)



ASN1_SEQUENCE(CMS_PasswordRecipientInfo) = {

        ASN1_SIMPLE(CMS_PasswordRecipientInfo, version, LONG),

        ASN1_SIMPLE(CMS_PasswordRecipientInfo, version, INT32),

        ASN1_IMP_OPT(CMS_PasswordRecipientInfo, keyDerivationAlgorithm, X509_ALGOR, 0),

        ASN1_SIMPLE(CMS_PasswordRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),

        ASN1_SIMPLE(CMS_PasswordRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
@@ -225,7 +225,7 @@ ASN1_CHOICE_cb(CMS_RecipientInfo, cms_ri_cb) = { 
} ASN1_CHOICE_END_cb(CMS_RecipientInfo, CMS_RecipientInfo, type)



ASN1_NDEF_SEQUENCE(CMS_EnvelopedData) = {

        ASN1_SIMPLE(CMS_EnvelopedData, version, LONG),

        ASN1_SIMPLE(CMS_EnvelopedData, version, INT32),

        ASN1_IMP_OPT(CMS_EnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),

        ASN1_SET_OF(CMS_EnvelopedData, recipientInfos, CMS_RecipientInfo),

        ASN1_SIMPLE(CMS_EnvelopedData, encryptedContentInfo, CMS_EncryptedContentInfo),
@@ -233,20 +233,20 @@ ASN1_NDEF_SEQUENCE(CMS_EnvelopedData) = { 
} ASN1_NDEF_SEQUENCE_END(CMS_EnvelopedData)



ASN1_NDEF_SEQUENCE(CMS_DigestedData) = {

        ASN1_SIMPLE(CMS_DigestedData, version, LONG),

        ASN1_SIMPLE(CMS_DigestedData, version, INT32),

        ASN1_SIMPLE(CMS_DigestedData, digestAlgorithm, X509_ALGOR),

        ASN1_SIMPLE(CMS_DigestedData, encapContentInfo, CMS_EncapsulatedContentInfo),

        ASN1_SIMPLE(CMS_DigestedData, digest, ASN1_OCTET_STRING)

} ASN1_NDEF_SEQUENCE_END(CMS_DigestedData)



ASN1_NDEF_SEQUENCE(CMS_EncryptedData) = {

        ASN1_SIMPLE(CMS_EncryptedData, version, LONG),

        ASN1_SIMPLE(CMS_EncryptedData, version, INT32),

        ASN1_SIMPLE(CMS_EncryptedData, encryptedContentInfo, CMS_EncryptedContentInfo),

        ASN1_IMP_SET_OF_OPT(CMS_EncryptedData, unprotectedAttrs, X509_ATTRIBUTE, 1)

} ASN1_NDEF_SEQUENCE_END(CMS_EncryptedData)



ASN1_NDEF_SEQUENCE(CMS_AuthenticatedData) = {

        ASN1_SIMPLE(CMS_AuthenticatedData, version, LONG),

        ASN1_SIMPLE(CMS_AuthenticatedData, version, INT32),

        ASN1_IMP_OPT(CMS_AuthenticatedData, originatorInfo, CMS_OriginatorInfo, 0),

        ASN1_SET_OF(CMS_AuthenticatedData, recipientInfos, CMS_RecipientInfo),

        ASN1_SIMPLE(CMS_AuthenticatedData, macAlgorithm, X509_ALGOR),
@@ -258,7 +258,7 @@ ASN1_NDEF_SEQUENCE(CMS_AuthenticatedData) = { 
} static_ASN1_NDEF_SEQUENCE_END(CMS_AuthenticatedData)



ASN1_NDEF_SEQUENCE(CMS_CompressedData) = {

        ASN1_SIMPLE(CMS_CompressedData, version, LONG),

        ASN1_SIMPLE(CMS_CompressedData, version, INT32),

        ASN1_SIMPLE(CMS_CompressedData, compressionAlgorithm, X509_ALGOR),

        ASN1_SIMPLE(CMS_CompressedData, encapContentInfo, CMS_EncapsulatedContentInfo),

} ASN1_NDEF_SEQUENCE_END(CMS_CompressedData)
@@ -337,7 +337,7 @@ ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Verify) 




ASN1_CHOICE(CMS_ReceiptsFrom) = {

  ASN1_IMP(CMS_ReceiptsFrom, d.allOrFirstTier, LONG, 0),

  ASN1_IMP(CMS_ReceiptsFrom, d.allOrFirstTier, INT32, 0),

  ASN1_IMP_SEQUENCE_OF(CMS_ReceiptsFrom, d.receiptList, GENERAL_NAMES, 1)

} static_ASN1_CHOICE_END(CMS_ReceiptsFrom)
@@ -348,7 +348,7 @@ ASN1_SEQUENCE(CMS_ReceiptRequest) = { 
} ASN1_SEQUENCE_END(CMS_ReceiptRequest)



ASN1_SEQUENCE(CMS_Receipt) = {

  ASN1_SIMPLE(CMS_Receipt, version, LONG),

  ASN1_SIMPLE(CMS_Receipt, version, INT32),

  ASN1_SIMPLE(CMS_Receipt, contentType, ASN1_OBJECT),

  ASN1_SIMPLE(CMS_Receipt, signedContentIdentifier, ASN1_OCTET_STRING),

  ASN1_SIMPLE(CMS_Receipt, originatorSignatureValue, ASN1_OCTET_STRING)

crypto/cms/cms_lcl.h

+13 −13
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct CMS_ContentInfo_st { 
DEFINE_STACK_OF(CMS_CertificateChoices)



struct CMS_SignedData_st {

    long version;

    int32_t version;

    STACK_OF(X509_ALGOR) *digestAlgorithms;

    CMS_EncapsulatedContentInfo *encapContentInfo;

    STACK_OF(CMS_CertificateChoices) *certificates;
@@ -83,7 +83,7 @@ struct CMS_EncapsulatedContentInfo_st { 
};



struct CMS_SignerInfo_st {

    long version;

    int32_t version;

    CMS_SignerIdentifier *sid;

    X509_ALGOR *digestAlgorithm;

    STACK_OF(X509_ATTRIBUTE) *signedAttrs;
@@ -107,7 +107,7 @@ struct CMS_SignerIdentifier_st { 
};



struct CMS_EnvelopedData_st {

    long version;

    int32_t version;

    CMS_OriginatorInfo *originatorInfo;

    STACK_OF(CMS_RecipientInfo) *recipientInfos;

    CMS_EncryptedContentInfo *encryptedContentInfo;
@@ -145,7 +145,7 @@ struct CMS_RecipientInfo_st { 
typedef CMS_SignerIdentifier CMS_RecipientIdentifier;



struct CMS_KeyTransRecipientInfo_st {

    long version;

    int32_t version;

    CMS_RecipientIdentifier *rid;

    X509_ALGOR *keyEncryptionAlgorithm;

    ASN1_OCTET_STRING *encryptedKey;
@@ -157,7 +157,7 @@ struct CMS_KeyTransRecipientInfo_st { 
};



struct CMS_KeyAgreeRecipientInfo_st {

    long version;

    int32_t version;

    CMS_OriginatorIdentifierOrKey *originator;

    ASN1_OCTET_STRING *ukm;

    X509_ALGOR *keyEncryptionAlgorithm;
@@ -204,7 +204,7 @@ struct CMS_RecipientKeyIdentifier_st { 
};



struct CMS_KEKRecipientInfo_st {

    long version;

    int32_t version;

    CMS_KEKIdentifier *kekid;

    X509_ALGOR *keyEncryptionAlgorithm;

    ASN1_OCTET_STRING *encryptedKey;
@@ -220,7 +220,7 @@ struct CMS_KEKIdentifier_st { 
};



struct CMS_PasswordRecipientInfo_st {

    long version;

    int32_t version;

    X509_ALGOR *keyDerivationAlgorithm;

    X509_ALGOR *keyEncryptionAlgorithm;

    ASN1_OCTET_STRING *encryptedKey;
@@ -235,20 +235,20 @@ struct CMS_OtherRecipientInfo_st { 
};



struct CMS_DigestedData_st {

    long version;

    int32_t version;

    X509_ALGOR *digestAlgorithm;

    CMS_EncapsulatedContentInfo *encapContentInfo;

    ASN1_OCTET_STRING *digest;

};



struct CMS_EncryptedData_st {

    long version;

    int32_t version;

    CMS_EncryptedContentInfo *encryptedContentInfo;

    STACK_OF(X509_ATTRIBUTE) *unprotectedAttrs;

};



struct CMS_AuthenticatedData_st {

    long version;

    int32_t version;

    CMS_OriginatorInfo *originatorInfo;

    STACK_OF(CMS_RecipientInfo) *recipientInfos;

    X509_ALGOR *macAlgorithm;
@@ -260,7 +260,7 @@ struct CMS_AuthenticatedData_st { 
};



struct CMS_CompressedData_st {

    long version;

    int32_t version;

    X509_ALGOR *compressionAlgorithm;

    STACK_OF(CMS_RecipientInfo) *recipientInfos;

    CMS_EncapsulatedContentInfo *encapContentInfo;
@@ -332,14 +332,14 @@ struct CMS_ReceiptRequest_st { 
struct CMS_ReceiptsFrom_st {

    int type;

    union {

        long allOrFirstTier;

        int32_t allOrFirstTier;

        STACK_OF(GENERAL_NAMES) *receiptList;

    } d;

};

# endif



struct CMS_Receipt_st {

    long version;

    int32_t version;

    ASN1_OBJECT *contentType;

    ASN1_OCTET_STRING *signedContentIdentifier;

    ASN1_OCTET_STRING *originatorSignatureValue;

crypto/dh/dh_asn1.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 
ASN1_SEQUENCE_cb(DHparams, dh_cb) = {

        ASN1_SIMPLE(DH, p, BIGNUM),

        ASN1_SIMPLE(DH, g, BIGNUM),

        ASN1_OPT(DH, length, ZLONG),

        ASN1_OPT(DH, length, ZINT32),

} ASN1_SEQUENCE_END_cb(DH, DHparams)



IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams)