Commit 599eccfc authored by Rich Salz's avatar Rich Salz
Browse files

RT3676 add: Export ASN.1 DHparams 



Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
parent a70ca740

crypto/dh/dh_asn1.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ ASN1_SEQUENCE_cb(DHparams, dh_cb) = { 
        ASN1_SIMPLE(DH, p, BIGNUM),

        ASN1_SIMPLE(DH, p, BIGNUM),

        ASN1_SIMPLE(DH, g, BIGNUM),

        ASN1_SIMPLE(DH, g, BIGNUM),

        ASN1_OPT(DH, length, ZLONG),

        ASN1_OPT(DH, length, ZLONG),

} static_ASN1_SEQUENCE_END_cb(DH, DHparams)

} ASN1_SEQUENCE_END_cb(DH, DHparams)





IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams)

IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams)

include/openssl/dh.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,7 @@ 
# endif

# endif





# include <openssl/bio.h>

# include <openssl/bio.h>

# include <openssl/asn1.h>

# include <openssl/ossl_typ.h>

# include <openssl/ossl_typ.h>

# if OPENSSL_API_COMPAT < 0x10100000L

# if OPENSSL_API_COMPAT < 0x10100000L

#  include <openssl/bn.h>

#  include <openssl/bn.h>
@@ -159,6 +160,8 @@ struct dh_st { 
    CRYPTO_RWLOCK *lock;

    CRYPTO_RWLOCK *lock;

};

};





DECLARE_ASN1_ITEM(DHparams)



# define DH_GENERATOR_2          2

# define DH_GENERATOR_2          2

/* #define DH_GENERATOR_3       3 */

/* #define DH_GENERATOR_3       3 */

# define DH_GENERATOR_5          5

# define DH_GENERATOR_5          5

util/libcrypto.num

+2 −0
Original line number Original line Diff line number Diff line
@@ -4058,3 +4058,5 @@ ECPARAMETERS_it 3922 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION: 
ECPKPARAMETERS_it                       3923	1_1_0	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:EC

ECPKPARAMETERS_it                       3923	1_1_0	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:EC

ECPKPARAMETERS_it                       3923	1_1_0	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:EC

ECPKPARAMETERS_it                       3923	1_1_0	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:EC

EC_GROUP_get_ecparameters               3924	1_1_0	EXIST::FUNCTION:EC

EC_GROUP_get_ecparameters               3924	1_1_0	EXIST::FUNCTION:EC

DHparams_it                             3925	1_1_0	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DH

DHparams_it                             3925	1_1_0	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DH