Commit 64f11ee8 authored by Richard Levitte's avatar Richard Levitte
Browse files

Publish our INT32, UINT32, INT64, UINT64 ASN.1 types and Z variants 



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 ce57ac43

crypto/asn1/asn1_item_list.h

+8 −0
Original line number Diff line number Diff line
@@ -160,4 +160,12 @@ static ASN1_ITEM_EXP *asn1_item_list[] = { 
    ASN1_ITEM_ref(X509_VAL),

    ASN1_ITEM_ref(X509),

    ASN1_ITEM_ref(ZLONG),

    ASN1_ITEM_ref(INT32),

    ASN1_ITEM_ref(UINT32),

    ASN1_ITEM_ref(ZINT32),

    ASN1_ITEM_ref(ZUINT32),

    ASN1_ITEM_ref(INT64),

    ASN1_ITEM_ref(UINT64),

    ASN1_ITEM_ref(ZINT64),

    ASN1_ITEM_ref(ZUINT64),

};

crypto/asn1/x_int64.c

+1 −1
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 


#include <stdio.h>

#include "internal/cryptlib.h"

#include "internal/asn1t.h"

#include "internal/numbers.h"

#include <openssl/asn1t.h>

#include <openssl/bn.h>

#include "asn1_locl.h"

fuzz/asn1.c

+8 −0
Original line number Diff line number Diff line
@@ -181,6 +181,14 @@ static ASN1_ITEM_EXP *item_type[] = { 
    ASN1_ITEM_ref(X509_SIG),

    ASN1_ITEM_ref(X509_VAL),

    ASN1_ITEM_ref(ZLONG),

    ASN1_ITEM_ref(INT32),

    ASN1_ITEM_ref(ZINT32),

    ASN1_ITEM_ref(UINT32),

    ASN1_ITEM_ref(ZUINT32),

    ASN1_ITEM_ref(INT64),

    ASN1_ITEM_ref(ZINT64),

    ASN1_ITEM_ref(UINT64),

    ASN1_ITEM_ref(ZUINT64),

    NULL

};

include/internal/asn1t.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

 * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include <openssl/asn1t.h>



DECLARE_ASN1_ITEM(INT32)

DECLARE_ASN1_ITEM(ZINT32)

DECLARE_ASN1_ITEM(UINT32)

DECLARE_ASN1_ITEM(ZUINT32)

DECLARE_ASN1_ITEM(INT64)

DECLARE_ASN1_ITEM(ZINT64)

DECLARE_ASN1_ITEM(UINT64)

DECLARE_ASN1_ITEM(ZUINT64)

include/openssl/asn1t.h

+8 −0
Original line number Diff line number Diff line
@@ -901,6 +901,14 @@ DECLARE_ASN1_ITEM(ASN1_FBOOLEAN) 
DECLARE_ASN1_ITEM(ASN1_SEQUENCE)

DECLARE_ASN1_ITEM(CBIGNUM)

DECLARE_ASN1_ITEM(BIGNUM)

DECLARE_ASN1_ITEM(INT32)

DECLARE_ASN1_ITEM(ZINT32)

DECLARE_ASN1_ITEM(UINT32)

DECLARE_ASN1_ITEM(ZUINT32)

DECLARE_ASN1_ITEM(INT64)

DECLARE_ASN1_ITEM(ZINT64)

DECLARE_ASN1_ITEM(UINT64)

DECLARE_ASN1_ITEM(ZUINT64)

DECLARE_ASN1_ITEM(LONG)

DECLARE_ASN1_ITEM(ZLONG)