Commit 37659ea4 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Matt Caswell
Browse files

Add parentheses on public macros where appropriate. 


Fixes #3063.

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

include/openssl/asn1t.h

+5 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern "C" { 
# else



/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */

#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr()))

#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)((iptr)()))



/* Macros for start and end of ASN1_ITEM definition */
@@ -325,10 +325,10 @@ extern "C" { 
/* implicit and explicit helper macros */



# define ASN1_IMP_EX(stname, field, type, tag, ex) \

                ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | ex, tag, stname, field, type)

         ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | (ex), tag, stname, field, type)



# define ASN1_EXP_EX(stname, field, type, tag, ex) \

                ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | ex, tag, stname, field, type)

         ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | (ex), tag, stname, field, type)



/* Any defined by macros: the field used is in the table itself */
@@ -531,10 +531,10 @@ struct ASN1_ADB_TABLE_st { 
# define ASN1_TFLG_TAG_MASK      (0x3 << 3)



/* context specific IMPLICIT */

# define ASN1_TFLG_IMPLICIT      ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT

# define ASN1_TFLG_IMPLICIT      (ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT)



/* context specific EXPLICIT */

# define ASN1_TFLG_EXPLICIT      ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT

# define ASN1_TFLG_EXPLICIT      (ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT)



/*

 * If tagging is in force these determine the type of tag to use. Otherwise

include/openssl/bio.h

+27 −20
Original line number Diff line number Diff line
@@ -368,9 +368,12 @@ struct bio_dgram_sctp_prinfo { 
#  define BIO_FAMILY_IPANY                        256



/* BIO_s_connect() */

#  define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)

#  define BIO_set_conn_port(b,port)     BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)

#  define BIO_set_conn_address(b,addr)  BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)addr)

#  define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0, \

                                                 (char *)(name))

#  define BIO_set_conn_port(b,port)     BIO_ctrl(b,BIO_C_SET_CONNECT,1, \

                                                 (char *)(port))

#  define BIO_set_conn_address(b,addr)  BIO_ctrl(b,BIO_C_SET_CONNECT,2, \

                                                 (char *)(addr))

#  define BIO_set_conn_ip_family(b,f)   BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)

#  define BIO_get_conn_hostname(b)      ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0))

#  define BIO_get_conn_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1))
@@ -379,15 +382,18 @@ struct bio_dgram_sctp_prinfo { 
#  define BIO_set_conn_mode(b,n)        BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)



/* BIO_s_accept() */

#  define BIO_set_accept_name(b,name)   BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)

#  define BIO_set_accept_port(b,port)   BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(char *)port)

#  define BIO_set_accept_name(b,name)   BIO_ctrl(b,BIO_C_SET_ACCEPT,0, \

                                                 (char *)(name))

#  define BIO_set_accept_port(b,port)   BIO_ctrl(b,BIO_C_SET_ACCEPT,1, \

                                                 (char *)(port))

#  define BIO_get_accept_name(b)        ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0))

#  define BIO_get_accept_port(b)        ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,1))

#  define BIO_get_peer_name(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,2))

#  define BIO_get_peer_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,3))

/* #define BIO_set_nbio(b,n)    BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */

#  define BIO_set_nbio_accept(b,n)      BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(n)?(void *)"a":NULL)

#  define BIO_set_accept_bios(b,bio)    BIO_ctrl(b,BIO_C_SET_ACCEPT,3,(char *)bio)

#  define BIO_set_accept_bios(b,bio)    BIO_ctrl(b,BIO_C_SET_ACCEPT,3, \

                                                 (char *)(bio))

#  define BIO_set_accept_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_ACCEPT,4,f)

#  define BIO_get_accept_ip_family(b)   BIO_ctrl(b,BIO_C_GET_ACCEPT,4,NULL)
@@ -407,11 +413,11 @@ struct bio_dgram_sctp_prinfo { 


/* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and BIO_s_connect() */

# define BIO_set_fd(b,fd,c)      BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)

# define BIO_get_fd(b,c)         BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)

# define BIO_get_fd(b,c)         BIO_ctrl(b,BIO_C_GET_FD,0,(char *)(c))



/* BIO_s_file() */

# define BIO_set_fp(b,fp,c)      BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)

# define BIO_get_fp(b,fpp)       BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)

# define BIO_set_fp(b,fp,c)      BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)(fp))

# define BIO_get_fp(b,fpp)       BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)(fpp))



/* BIO_s_fd() and BIO_s_file() */

# define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
@@ -429,7 +435,7 @@ struct bio_dgram_sctp_prinfo { 
int BIO_read_filename(BIO *b, const char *name);

# else

#  define BIO_read_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \

                BIO_CLOSE|BIO_FP_READ,(char *)name)

                BIO_CLOSE|BIO_FP_READ,(char *)(name))

# endif

# define BIO_write_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \

                BIO_CLOSE|BIO_FP_WRITE,name)
@@ -444,8 +450,8 @@ int BIO_read_filename(BIO *b, const char *name); 
 * next_bio field in the bio.  So when you free the BIO, make sure you are

 * doing a BIO_free_all() to catch the underlying BIO.

 */

# define BIO_set_ssl(b,ssl,c)    BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)ssl)

# define BIO_get_ssl(b,sslp)     BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)sslp)

# define BIO_set_ssl(b,ssl,c)    BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)(ssl))

# define BIO_get_ssl(b,sslp)     BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)(sslp))

# define BIO_set_ssl_mode(b,client)      BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL)

# define BIO_set_ssl_renegotiate_bytes(b,num) \

        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL)
@@ -455,11 +461,12 @@ int BIO_read_filename(BIO *b, const char *name); 
        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL)



/* defined in evp.h */

/* #define BIO_set_md(b,md)     BIO_ctrl(b,BIO_C_SET_MD,1,(char *)md) */

/* #define BIO_set_md(b,md)     BIO_ctrl(b,BIO_C_SET_MD,1,(char *)(md)) */



# define BIO_get_mem_data(b,pp)  BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)

# define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)bm)

# define BIO_get_mem_ptr(b,pp)   BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0,(char *)pp)

# define BIO_get_mem_data(b,pp)  BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)(pp))

# define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)(bm))

# define BIO_get_mem_ptr(b,pp)   BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0, \

                                          (char *)(pp))

# define BIO_set_mem_eof_return(b,v) \

                                BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL)
@@ -505,17 +512,17 @@ int BIO_ctrl_reset_read_request(BIO *b); 


/* ctrl macros for dgram */

# define BIO_ctrl_dgram_connect(b,peer)  \

                     (int)BIO_ctrl(b,BIO_CTRL_DGRAM_CONNECT,0, (char *)peer)

                     (int)BIO_ctrl(b,BIO_CTRL_DGRAM_CONNECT,0, (char *)(peer))

# define BIO_ctrl_set_connected(b,peer) \

         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, 0, (char *)peer)

         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, 0, (char *)(peer))

# define BIO_dgram_recv_timedout(b) \

         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)

# define BIO_dgram_send_timedout(b) \

         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)

# define BIO_dgram_get_peer(b,peer) \

         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)peer)

         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)(peer))

# define BIO_dgram_set_peer(b,peer) \

         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)peer)

         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)(peer))

# define BIO_dgram_get_mtu_overhead(b) \

         (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_MTU_OVERHEAD, 0, NULL)

include/openssl/dh.h

+7 −7
Original line number Diff line number Diff line
@@ -250,22 +250,22 @@ int DH_meth_set_generate_params(DH_METHOD *dhm, 
# define EVP_PKEY_CTX_set0_dh_kdf_oid(ctx, oid) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)oid)

                                EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)(oid))



# define EVP_PKEY_CTX_get0_dh_kdf_oid(ctx, poid) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)poid)

                                EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)(poid))



# define EVP_PKEY_CTX_set_dh_kdf_md(ctx, md) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)md)

                                EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)(md))



# define EVP_PKEY_CTX_get_dh_kdf_md(ctx, pmd) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)pmd)

                                EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)(pmd))



# define EVP_PKEY_CTX_set_dh_kdf_outlen(ctx, len) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
@@ -275,17 +275,17 @@ int DH_meth_set_generate_params(DH_METHOD *dhm, 
# define EVP_PKEY_CTX_get_dh_kdf_outlen(ctx, plen) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                EVP_PKEY_OP_DERIVE, \

                        EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, 0, (void *)plen)

                        EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, 0, (void *)(plen))



# define EVP_PKEY_CTX_set0_dh_kdf_ukm(ctx, p, plen) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_DH_KDF_UKM, plen, (void *)p)

                                EVP_PKEY_CTRL_DH_KDF_UKM, plen, (void *)(p))



# define EVP_PKEY_CTX_get0_dh_kdf_ukm(ctx, p) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_GET_DH_KDF_UKM, 0, (void *)p)

                                EVP_PKEY_CTRL_GET_DH_KDF_UKM, 0, (void *)(p))



# define EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN     (EVP_PKEY_ALG_CTRL + 1)

# define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR     (EVP_PKEY_ALG_CTRL + 2)

include/openssl/ec.h

+6 −5
Original line number Diff line number Diff line
@@ -1316,12 +1316,12 @@ void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth, 
# define EVP_PKEY_CTX_set_ecdh_kdf_md(ctx, md) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_EC_KDF_MD, 0, (void *)md)

                                EVP_PKEY_CTRL_EC_KDF_MD, 0, (void *)(md))



# define EVP_PKEY_CTX_get_ecdh_kdf_md(ctx, pmd) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_GET_EC_KDF_MD, 0, (void *)pmd)

                                EVP_PKEY_CTRL_GET_EC_KDF_MD, 0, (void *)(pmd))



# define EVP_PKEY_CTX_set_ecdh_kdf_outlen(ctx, len) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
@@ -1331,17 +1331,18 @@ void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth, 
# define EVP_PKEY_CTX_get_ecdh_kdf_outlen(ctx, plen) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \

                                EVP_PKEY_OP_DERIVE, \

                        EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, 0, (void *)plen)

                                EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, 0, \

                                (void *)(plen))



# define EVP_PKEY_CTX_set0_ecdh_kdf_ukm(ctx, p, plen) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_EC_KDF_UKM, plen, (void *)p)

                                EVP_PKEY_CTRL_EC_KDF_UKM, plen, (void *)(p))



# define EVP_PKEY_CTX_get0_ecdh_kdf_ukm(ctx, p) \

        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \

                                EVP_PKEY_OP_DERIVE, \

                                EVP_PKEY_CTRL_GET_EC_KDF_UKM, 0, (void *)p)

                                EVP_PKEY_CTRL_GET_EC_KDF_UKM, 0, (void *)(p))



# define EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID             (EVP_PKEY_ALG_CTRL + 1)

# define EVP_PKEY_CTRL_EC_PARAM_ENC                      (EVP_PKEY_ALG_CTRL + 2)

include/openssl/evp.h

+14 −11
Original line number Diff line number Diff line
@@ -476,8 +476,8 @@ void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data); 
# endif

# define EVP_CIPHER_CTX_mode(c)         EVP_CIPHER_mode(EVP_CIPHER_CTX_cipher(c))



# define EVP_ENCODE_LENGTH(l)    (((l+2)/3*4)+(l/48+1)*2+80)

# define EVP_DECODE_LENGTH(l)    ((l+3)/4*3+80)

# define EVP_ENCODE_LENGTH(l)    ((((l)+2)/3*4)+((l)/48+1)*2+80)

# define EVP_DECODE_LENGTH(l)    (((l)+3)/4*3+80)



# define EVP_SignInit_ex(a,b,c)          EVP_DigestInit_ex(a,b,c)

# define EVP_SignInit(a,b)               EVP_DigestInit(a,b)
@@ -493,13 +493,16 @@ void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data); 
# ifdef CONST_STRICT

void BIO_set_md(BIO *, const EVP_MD *md);

# else

#  define BIO_set_md(b,md)               BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md)

#  define BIO_set_md(b,md)          BIO_ctrl(b,BIO_C_SET_MD,0,(char *)(md))

# endif

# define BIO_get_md(b,mdp)               BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)

# define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)

# define BIO_set_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_SET_MD_CTX,0,(char *)mdcp)

# define BIO_get_md(b,mdp)          BIO_ctrl(b,BIO_C_GET_MD,0,(char *)(mdp))

# define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0, \

                                             (char *)(mdcp))

# define BIO_set_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_SET_MD_CTX,0, \

                                             (char *)(mdcp))

# define BIO_get_cipher_status(b)   BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)

# define BIO_get_cipher_ctx(b,c_pp)      BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)

# define BIO_get_cipher_ctx(b,c_pp) BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0, \

                                             (char *)(c_pp))



/*__owur*/ int EVP_Cipher(EVP_CIPHER_CTX *c,

                          unsigned char *out,
@@ -1195,15 +1198,15 @@ void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, 


# define  EVP_PKEY_CTX_set_signature_md(ctx, md) \

                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \

                                        EVP_PKEY_CTRL_MD, 0, (void *)md)

                                        EVP_PKEY_CTRL_MD, 0, (void *)(md))



# define  EVP_PKEY_CTX_get_signature_md(ctx, pmd)        \

                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \

                                        EVP_PKEY_CTRL_GET_MD, 0, (void *)pmd)

                                        EVP_PKEY_CTRL_GET_MD, 0, (void *)(pmd))



# define  EVP_PKEY_CTX_set_mac_key(ctx, key, len)        \

                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_KEYGEN,  \

                                  EVP_PKEY_CTRL_SET_MAC_KEY, len, (void *)key)

                                  EVP_PKEY_CTRL_SET_MAC_KEY, len, (void *)(key))



# define EVP_PKEY_CTRL_MD                1

# define EVP_PKEY_CTRL_PEER_KEY          2