From e6d1e5a8710f8fb0f3686be74113c0ebf09ceeae Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Fri, 6 Nov 2015 16:13:40 -0500 Subject: [PATCH] Use typedef names, not struct names. Not sure if we want to leave bio.h and bytestring.h's instance as-is, but the evp.h ones are just baffling. Change-Id: I485c2e355ba93764da0c4c72c48af48b055a8500 Reviewed-on: https://boringssl-review.googlesource.com/6454 Reviewed-by: Adam Langley --- include/openssl/bio.h | 4 ++-- include/openssl/bytestring.h | 2 +- include/openssl/evp.h | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/openssl/bio.h b/include/openssl/bio.h index 8d475949..c88a3e18 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -797,7 +797,7 @@ struct bio_method_st { struct bio_st { const BIO_METHOD *method; /* bio, mode, argp, argi, argl, ret */ - long (*callback)(struct bio_st *, int, const char *, int, long, long); + long (*callback)(BIO *, int, const char *, int, long, long); char *cb_arg; /* first argument for the callback */ /* init is non-zero if this |BIO| has been initialised. */ @@ -816,7 +816,7 @@ struct bio_st { void *ptr; /* next_bio points to the next |BIO| in a chain. This |BIO| owns a reference * to |next_bio|. */ - struct bio_st *next_bio; /* used by filter BIOs */ + BIO *next_bio; /* used by filter BIOs */ size_t num_read, num_write; }; diff --git a/include/openssl/bytestring.h b/include/openssl/bytestring.h index 2fa065e3..906e7e88 100644 --- a/include/openssl/bytestring.h +++ b/include/openssl/bytestring.h @@ -242,7 +242,7 @@ struct cbb_st { * pending length-prefix. */ size_t offset; /* child points to a child CBB if a length-prefix is pending. */ - struct cbb_st *child; + CBB *child; /* pending_len_len contains the number of bytes in a pending length-prefix, * or zero if no length-prefix is pending. */ uint8_t pending_len_len; diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 095a498f..6f594e59 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -150,17 +150,17 @@ OPENSSL_EXPORT int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key); OPENSSL_EXPORT int EVP_PKEY_assign_RSA(EVP_PKEY *pkey, RSA *key); OPENSSL_EXPORT RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey); -OPENSSL_EXPORT int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, struct dsa_st *key); +OPENSSL_EXPORT int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key); OPENSSL_EXPORT int EVP_PKEY_assign_DSA(EVP_PKEY *pkey, DSA *key); -OPENSSL_EXPORT struct dsa_st *EVP_PKEY_get1_DSA(EVP_PKEY *pkey); +OPENSSL_EXPORT DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey); -OPENSSL_EXPORT int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, struct ec_key_st *key); +OPENSSL_EXPORT int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key); OPENSSL_EXPORT int EVP_PKEY_assign_EC_KEY(EVP_PKEY *pkey, EC_KEY *key); -OPENSSL_EXPORT struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey); +OPENSSL_EXPORT EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey); -OPENSSL_EXPORT int EVP_PKEY_set1_DH(EVP_PKEY *pkey, struct dh_st *key); +OPENSSL_EXPORT int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key); OPENSSL_EXPORT int EVP_PKEY_assign_DH(EVP_PKEY *pkey, DH *key); -OPENSSL_EXPORT struct dh_st *EVP_PKEY_get1_DH(EVP_PKEY *pkey); +OPENSSL_EXPORT DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey); #define EVP_PKEY_NONE NID_undef #define EVP_PKEY_RSA NID_rsaEncryption