Revert "Namespace crypto/trust_token's internal symbols." This reverts commit bb9a6cc1237421527806ff33d85961a59e68337e. Reason for revert: looks like a lot of code depends on STACK_OF(T) expanding to stack_st_T. Original change's description: > Namespace crypto/trust_token's internal symbols. > > Required adding namespace support to `BORINGSSL_DEFINE_STACK_TRAITS`. > > Down from to 1019 to 949 exported symbols. > > Bug: 42220000 > Change-Id: I89bd01bd030c854320cf3e16984d0e2e22640591 > Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/86050 > Auto-Submit: Rudolf Polzer <rpolzer@google.com> > Reviewed-by: Xiangfei Ding <xfding@google.com> > Reviewed-by: David Benjamin <davidben@google.com> > Commit-Queue: David Benjamin <davidben@google.com> TBR=davidben@google.com,boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com,rpolzer@google.com,xfding@google.com No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 42220000 Change-Id: I3bad910aa76740d1bb11e0fe1baa77e9cef9a82a Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/86587 Reviewed-by: Lily Chen <chlily@google.com> Commit-Queue: Lily Chen <chlily@google.com> Auto-Submit: David Benjamin <davidben@google.com>
diff --git a/bench/trust_token.cc b/bench/trust_token.cc index f05e8b8..3bb57e1 100644 --- a/bench/trust_token.cc +++ b/bench/trust_token.cc
@@ -22,8 +22,6 @@ #include "../crypto/mem_internal.h" #include "../crypto/trust_token/internal.h" -using namespace bssl; - namespace { const uint8_t kClientData[] = "\x70TEST CLIENT DATA"; @@ -155,7 +153,7 @@ void SpeedFinishIssue(benchmark::State &state) { for (auto _ : state) { size_t key_index2; - UniquePtr<STACK_OF(TRUST_TOKEN)> test_tokens( + bssl::UniquePtr<STACK_OF(TRUST_TOKEN)> test_tokens( TRUST_TOKEN_CLIENT_finish_issuance(client_.get(), &key_index2, free_issue_resp_.data(), free_issue_resp_.size())); @@ -269,21 +267,21 @@ private: size_t batchsize_; const TRUST_TOKEN_METHOD *method_; - UniquePtr<TRUST_TOKEN_CLIENT> client_; - UniquePtr<TRUST_TOKEN_ISSUER> issuer_; + bssl::UniquePtr<TRUST_TOKEN_CLIENT> client_; + bssl::UniquePtr<TRUST_TOKEN_ISSUER> issuer_; uint8_t priv_key_[TRUST_TOKEN_MAX_PRIVATE_KEY_SIZE]; uint8_t pub_key_[TRUST_TOKEN_MAX_PUBLIC_KEY_SIZE]; - UniquePtr<EVP_PKEY> priv_; - UniquePtr<EVP_PKEY> pub_; + bssl::UniquePtr<EVP_PKEY> priv_; + bssl::UniquePtr<EVP_PKEY> pub_; - Array<uint8_t> free_issue_msg_; - Array<uint8_t> free_issue_resp_; - UniquePtr<STACK_OF(TRUST_TOKEN_PRETOKEN)> pretokens_; + bssl::Array<uint8_t> free_issue_msg_; + bssl::Array<uint8_t> free_issue_resp_; + bssl::UniquePtr<STACK_OF(TRUST_TOKEN_PRETOKEN)> pretokens_; size_t key_index_; - UniquePtr<STACK_OF(TRUST_TOKEN)> tokens_; - Array<uint8_t> free_redeem_msg_; + bssl::UniquePtr<STACK_OF(TRUST_TOKEN)> tokens_; + bssl::Array<uint8_t> free_redeem_msg_; }; void BM_SpeedTrustTokenKeyGen(benchmark::State &state,
diff --git a/crypto/trust_token/internal.h b/crypto/trust_token/internal.h index b3f055b..208e9c3 100644 --- a/crypto/trust_token/internal.h +++ b/crypto/trust_token/internal.h
@@ -25,7 +25,10 @@ #include <openssl/trust_token.h> -BSSL_NAMESPACE_BEGIN +#if defined(__cplusplus) +extern "C" { +#endif + // For the following cryptographic schemes, we use P-384 instead of our usual // choice of P-256. See Appendix I of @@ -77,7 +80,7 @@ // TRUST_TOKEN_PRETOKEN_free releases the memory associated with |token|. OPENSSL_EXPORT void TRUST_TOKEN_PRETOKEN_free(TRUST_TOKEN_PRETOKEN *token); -DEFINE_NAMESPACED_STACK_OF(TRUST_TOKEN_PRETOKEN) +DEFINE_STACK_OF(TRUST_TOKEN_PRETOKEN) // PMBTokens. @@ -251,8 +254,6 @@ size_t msg_len); -BSSL_NAMESPACE_END - // Trust Tokens internals. struct trust_token_method_st { @@ -270,14 +271,14 @@ // client_key_from_bytes decodes a client key from |in| and sets |key| // to the resulting key. It returns one on success and zero // on failure. - int (*client_key_from_bytes)(bssl::TRUST_TOKEN_CLIENT_KEY *key, - const uint8_t *in, size_t len); + int (*client_key_from_bytes)(TRUST_TOKEN_CLIENT_KEY *key, const uint8_t *in, + size_t len); // issuer_key_from_bytes decodes a issuer key from |in| and sets |key| // to the resulting key. It returns one on success and zero // on failure. - int (*issuer_key_from_bytes)(bssl::TRUST_TOKEN_ISSUER_KEY *key, - const uint8_t *in, size_t len); + int (*issuer_key_from_bytes)(TRUST_TOKEN_ISSUER_KEY *key, const uint8_t *in, + size_t len); // blind generates a new issuance request for |count| tokens. If // |include_message| is set, then |msg| is used to derive the token nonces. On @@ -287,10 +288,9 @@ // when the server responds. // // This function implements the AT.Usr0 operation. - STACK_OF(bssl::TRUST_TOKEN_PRETOKEN) *(*blind)(CBB *cbb, size_t count, - int include_message, - const uint8_t *msg, - size_t msg_len); + STACK_OF(TRUST_TOKEN_PRETOKEN) *(*blind)(CBB *cbb, size_t count, + int include_message, + const uint8_t *msg, size_t msg_len); // sign parses a request for |num_requested| tokens from |cbs| and // issues |num_to_issue| tokens with |key| and a private metadata value of @@ -298,7 +298,7 @@ // success and zero on failure. // // This function implements the AT.Sig operation. - int (*sign)(const bssl::TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, + int (*sign)(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, size_t num_requested, size_t num_to_issue, uint8_t private_metadata); @@ -311,9 +311,9 @@ // // This function implements the AT.Usr1 operation. STACK_OF(TRUST_TOKEN) *(*unblind)( - const bssl::TRUST_TOKEN_CLIENT_KEY *key, - const STACK_OF(bssl::TRUST_TOKEN_PRETOKEN) *pretokens, CBS *cbs, - size_t count, uint32_t key_id); + const TRUST_TOKEN_CLIENT_KEY *key, + const STACK_OF(TRUST_TOKEN_PRETOKEN) *pretokens, CBS *cbs, size_t count, + uint32_t key_id); // read parses a token from |token| and verifies it using |key|. If // |include_message| is set, then the nonce is derived from |msg| and the salt @@ -321,7 +321,7 @@ // metadata bit in |out_nonce| and |*out_private_metadata|. Otherwise, it // returns zero. Note that, unlike the output of |unblind|, |token| does not // have a four-byte key ID prepended. - int (*read)(const bssl::TRUST_TOKEN_ISSUER_KEY *key, + int (*read)(const TRUST_TOKEN_ISSUER_KEY *key, uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], uint8_t *out_private_metadata, const uint8_t *token, size_t token_len, int include_message, const uint8_t *msg, @@ -337,8 +337,6 @@ int has_srr; }; -BSSL_NAMESPACE_BEGIN - // Structure representing a single Trust Token public key with the specified ID. struct trust_token_client_key_st { uint32_t id; @@ -352,8 +350,6 @@ TRUST_TOKEN_ISSUER_KEY key; }; -BSSL_NAMESPACE_END - struct trust_token_client_st { const TRUST_TOKEN_METHOD *method; @@ -362,13 +358,13 @@ // keys is the set of public keys that are supported by the client for // issuance/redemptions. - struct bssl::trust_token_client_key_st keys[6]; + struct trust_token_client_key_st keys[6]; // num_keys is the number of keys currently configured. size_t num_keys; // pretokens is the intermediate state during an active issuance. - STACK_OF(bssl::TRUST_TOKEN_PRETOKEN) *pretokens; + STACK_OF(TRUST_TOKEN_PRETOKEN) *pretokens; // srr_key is the public key used to verify the signature of the SRR. EVP_PKEY *srr_key; @@ -384,7 +380,7 @@ // keys is the set of private keys that are supported by the issuer for // issuance/redemptions. The public metadata is an index into this list of // keys. - struct bssl::trust_token_issuer_key_st keys[6]; + struct trust_token_issuer_key_st keys[6]; // num_keys is the number of keys currently configured. size_t num_keys; @@ -398,10 +394,19 @@ size_t metadata_key_len; }; + +#if defined(__cplusplus) +} // extern C + +extern "C++" { + BSSL_NAMESPACE_BEGIN BORINGSSL_MAKE_DELETER(TRUST_TOKEN_PRETOKEN, TRUST_TOKEN_PRETOKEN_free) BSSL_NAMESPACE_END +} // extern C++ +#endif + #endif // OPENSSL_HEADER_CRYPTO_TRUST_TOKEN_INTERNAL_H
diff --git a/crypto/trust_token/pmbtoken.cc b/crypto/trust_token/pmbtoken.cc index d6749c7..0a819a8 100644 --- a/crypto/trust_token/pmbtoken.cc +++ b/crypto/trust_token/pmbtoken.cc
@@ -30,8 +30,6 @@ #include "internal.h" -using namespace bssl; - typedef int (*hash_t_func_t)(const EC_GROUP *group, EC_JACOBIAN *out, const uint8_t t[TRUST_TOKEN_NONCE_SIZE]); typedef int (*hash_s_func_t)(const EC_GROUP *group, EC_JACOBIAN *out, @@ -323,7 +321,7 @@ return 1; } -static STACK_OF(bssl::TRUST_TOKEN_PRETOKEN) *pmbtoken_blind( +static STACK_OF(TRUST_TOKEN_PRETOKEN) *pmbtoken_blind( const PMBTOKEN_METHOD *method, CBB *cbb, size_t count, int include_message, const uint8_t *msg, size_t msg_len) { SHA512_CTX hash_ctx; @@ -1227,7 +1225,7 @@ return 1; } -int bssl::pmbtoken_exp1_generate_key(CBB *out_private, CBB *out_public) { +int pmbtoken_exp1_generate_key(CBB *out_private, CBB *out_public) { if (!pmbtoken_exp1_init_method()) { return 0; } @@ -1235,10 +1233,9 @@ return pmbtoken_generate_key(&pmbtoken_exp1_method, out_private, out_public); } -int bssl::pmbtoken_exp1_derive_key_from_secret(CBB *out_private, - CBB *out_public, - const uint8_t *secret, - size_t secret_len) { +int pmbtoken_exp1_derive_key_from_secret(CBB *out_private, CBB *out_public, + const uint8_t *secret, + size_t secret_len) { if (!pmbtoken_exp1_init_method()) { return 0; } @@ -1247,27 +1244,26 @@ out_public, secret, secret_len); } -int bssl::pmbtoken_exp1_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, - const uint8_t *in, size_t len) { +int pmbtoken_exp1_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, + const uint8_t *in, size_t len) { if (!pmbtoken_exp1_init_method()) { return 0; } return pmbtoken_client_key_from_bytes(&pmbtoken_exp1_method, key, in, len); } -int bssl::pmbtoken_exp1_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, - const uint8_t *in, size_t len) { +int pmbtoken_exp1_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, + const uint8_t *in, size_t len) { if (!pmbtoken_exp1_init_method()) { return 0; } return pmbtoken_issuer_key_from_bytes(&pmbtoken_exp1_method, key, in, len); } -STACK_OF(TRUST_TOKEN_PRETOKEN) *bssl::pmbtoken_exp1_blind(CBB *cbb, - size_t count, - int include_message, - const uint8_t *msg, - size_t msg_len) { +STACK_OF(TRUST_TOKEN_PRETOKEN) *pmbtoken_exp1_blind(CBB *cbb, size_t count, + int include_message, + const uint8_t *msg, + size_t msg_len) { if (!pmbtoken_exp1_init_method()) { return nullptr; } @@ -1275,9 +1271,9 @@ msg_len); } -int bssl::pmbtoken_exp1_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, - CBS *cbs, size_t num_requested, - size_t num_to_issue, uint8_t private_metadata) { +int pmbtoken_exp1_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, + size_t num_requested, size_t num_to_issue, + uint8_t private_metadata) { if (!pmbtoken_exp1_init_method()) { return 0; } @@ -1285,7 +1281,7 @@ num_to_issue, private_metadata); } -STACK_OF(TRUST_TOKEN) *bssl::pmbtoken_exp1_unblind( +STACK_OF(TRUST_TOKEN) *pmbtoken_exp1_unblind( const TRUST_TOKEN_CLIENT_KEY *key, const STACK_OF(TRUST_TOKEN_PRETOKEN) *pretokens, CBS *cbs, size_t count, uint32_t key_id) { @@ -1296,12 +1292,11 @@ key_id); } -int bssl::pmbtoken_exp1_read(const TRUST_TOKEN_ISSUER_KEY *key, - uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], - uint8_t *out_private_metadata, - const uint8_t *token, size_t token_len, - int include_message, const uint8_t *msg, - size_t msg_len) { +int pmbtoken_exp1_read(const TRUST_TOKEN_ISSUER_KEY *key, + uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], + uint8_t *out_private_metadata, const uint8_t *token, + size_t token_len, int include_message, + const uint8_t *msg, size_t msg_len) { if (!pmbtoken_exp1_init_method()) { return 0; } @@ -1310,7 +1305,7 @@ msg, msg_len); } -int bssl::pmbtoken_exp1_get_h_for_testing(uint8_t out[97]) { +int pmbtoken_exp1_get_h_for_testing(uint8_t out[97]) { if (!pmbtoken_exp1_init_method()) { return 0; } @@ -1401,7 +1396,7 @@ return 1; } -int bssl::pmbtoken_exp2_generate_key(CBB *out_private, CBB *out_public) { +int pmbtoken_exp2_generate_key(CBB *out_private, CBB *out_public) { if (!pmbtoken_exp2_init_method()) { return 0; } @@ -1410,10 +1405,9 @@ } -int bssl::pmbtoken_exp2_derive_key_from_secret(CBB *out_private, - CBB *out_public, - const uint8_t *secret, - size_t secret_len) { +int pmbtoken_exp2_derive_key_from_secret(CBB *out_private, CBB *out_public, + const uint8_t *secret, + size_t secret_len) { if (!pmbtoken_exp2_init_method()) { return 0; } @@ -1422,27 +1416,26 @@ out_public, secret, secret_len); } -int bssl::pmbtoken_exp2_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, - const uint8_t *in, size_t len) { +int pmbtoken_exp2_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, + const uint8_t *in, size_t len) { if (!pmbtoken_exp2_init_method()) { return 0; } return pmbtoken_client_key_from_bytes(&pmbtoken_exp2_method, key, in, len); } -int bssl::pmbtoken_exp2_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, - const uint8_t *in, size_t len) { +int pmbtoken_exp2_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, + const uint8_t *in, size_t len) { if (!pmbtoken_exp2_init_method()) { return 0; } return pmbtoken_issuer_key_from_bytes(&pmbtoken_exp2_method, key, in, len); } -STACK_OF(TRUST_TOKEN_PRETOKEN) *bssl::pmbtoken_exp2_blind(CBB *cbb, - size_t count, - int include_message, - const uint8_t *msg, - size_t msg_len) { +STACK_OF(TRUST_TOKEN_PRETOKEN) *pmbtoken_exp2_blind(CBB *cbb, size_t count, + int include_message, + const uint8_t *msg, + size_t msg_len) { if (!pmbtoken_exp2_init_method()) { return nullptr; } @@ -1450,9 +1443,9 @@ msg_len); } -int bssl::pmbtoken_exp2_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, - CBS *cbs, size_t num_requested, - size_t num_to_issue, uint8_t private_metadata) { +int pmbtoken_exp2_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, + size_t num_requested, size_t num_to_issue, + uint8_t private_metadata) { if (!pmbtoken_exp2_init_method()) { return 0; } @@ -1460,7 +1453,7 @@ num_to_issue, private_metadata); } -STACK_OF(TRUST_TOKEN) *bssl::pmbtoken_exp2_unblind( +STACK_OF(TRUST_TOKEN) *pmbtoken_exp2_unblind( const TRUST_TOKEN_CLIENT_KEY *key, const STACK_OF(TRUST_TOKEN_PRETOKEN) *pretokens, CBS *cbs, size_t count, uint32_t key_id) { @@ -1471,12 +1464,11 @@ key_id); } -int bssl::pmbtoken_exp2_read(const TRUST_TOKEN_ISSUER_KEY *key, - uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], - uint8_t *out_private_metadata, - const uint8_t *token, size_t token_len, - int include_message, const uint8_t *msg, - size_t msg_len) { +int pmbtoken_exp2_read(const TRUST_TOKEN_ISSUER_KEY *key, + uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], + uint8_t *out_private_metadata, const uint8_t *token, + size_t token_len, int include_message, + const uint8_t *msg, size_t msg_len) { if (!pmbtoken_exp2_init_method()) { return 0; } @@ -1485,7 +1477,7 @@ msg, msg_len); } -int bssl::pmbtoken_exp2_get_h_for_testing(uint8_t out[97]) { +int pmbtoken_exp2_get_h_for_testing(uint8_t out[97]) { if (!pmbtoken_exp2_init_method()) { return 0; } @@ -1576,7 +1568,7 @@ return 1; } -int bssl::pmbtoken_pst1_generate_key(CBB *out_private, CBB *out_public) { +int pmbtoken_pst1_generate_key(CBB *out_private, CBB *out_public) { if (!pmbtoken_pst1_init_method()) { return 0; } @@ -1585,10 +1577,9 @@ } -int bssl::pmbtoken_pst1_derive_key_from_secret(CBB *out_private, - CBB *out_public, - const uint8_t *secret, - size_t secret_len) { +int pmbtoken_pst1_derive_key_from_secret(CBB *out_private, CBB *out_public, + const uint8_t *secret, + size_t secret_len) { if (!pmbtoken_pst1_init_method()) { return 0; } @@ -1597,27 +1588,26 @@ out_public, secret, secret_len); } -int bssl::pmbtoken_pst1_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, - const uint8_t *in, size_t len) { +int pmbtoken_pst1_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, + const uint8_t *in, size_t len) { if (!pmbtoken_pst1_init_method()) { return 0; } return pmbtoken_client_key_from_bytes(&pmbtoken_pst1_method, key, in, len); } -int bssl::pmbtoken_pst1_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, - const uint8_t *in, size_t len) { +int pmbtoken_pst1_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, + const uint8_t *in, size_t len) { if (!pmbtoken_pst1_init_method()) { return 0; } return pmbtoken_issuer_key_from_bytes(&pmbtoken_pst1_method, key, in, len); } -STACK_OF(TRUST_TOKEN_PRETOKEN) *bssl::pmbtoken_pst1_blind(CBB *cbb, - size_t count, - int include_message, - const uint8_t *msg, - size_t msg_len) { +STACK_OF(TRUST_TOKEN_PRETOKEN) *pmbtoken_pst1_blind(CBB *cbb, size_t count, + int include_message, + const uint8_t *msg, + size_t msg_len) { if (!pmbtoken_pst1_init_method()) { return nullptr; } @@ -1625,9 +1615,9 @@ msg_len); } -int bssl::pmbtoken_pst1_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, - CBS *cbs, size_t num_requested, - size_t num_to_issue, uint8_t private_metadata) { +int pmbtoken_pst1_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, + size_t num_requested, size_t num_to_issue, + uint8_t private_metadata) { if (!pmbtoken_pst1_init_method()) { return 0; } @@ -1635,7 +1625,7 @@ num_to_issue, private_metadata); } -STACK_OF(TRUST_TOKEN) *bssl::pmbtoken_pst1_unblind( +STACK_OF(TRUST_TOKEN) *pmbtoken_pst1_unblind( const TRUST_TOKEN_CLIENT_KEY *key, const STACK_OF(TRUST_TOKEN_PRETOKEN) *pretokens, CBS *cbs, size_t count, uint32_t key_id) { @@ -1646,12 +1636,11 @@ key_id); } -int bssl::pmbtoken_pst1_read(const TRUST_TOKEN_ISSUER_KEY *key, - uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], - uint8_t *out_private_metadata, - const uint8_t *token, size_t token_len, - int include_message, const uint8_t *msg, - size_t msg_len) { +int pmbtoken_pst1_read(const TRUST_TOKEN_ISSUER_KEY *key, + uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], + uint8_t *out_private_metadata, const uint8_t *token, + size_t token_len, int include_message, + const uint8_t *msg, size_t msg_len) { if (!pmbtoken_pst1_init_method()) { return 0; } @@ -1660,7 +1649,7 @@ msg, msg_len); } -int bssl::pmbtoken_pst1_get_h_for_testing(uint8_t out[97]) { +int pmbtoken_pst1_get_h_for_testing(uint8_t out[97]) { if (!pmbtoken_pst1_init_method()) { return 0; }
diff --git a/crypto/trust_token/trust_token.cc b/crypto/trust_token/trust_token.cc index 4848bf6..c13da8b 100644 --- a/crypto/trust_token/trust_token.cc +++ b/crypto/trust_token/trust_token.cc
@@ -30,8 +30,6 @@ // protocol for issuing and redeeming tokens built on top of the PMBTokens // construction. -using namespace bssl; - const TRUST_TOKEN_METHOD *TRUST_TOKEN_experiment_v1() { static const TRUST_TOKEN_METHOD kMethod = { pmbtoken_exp1_generate_key, @@ -118,7 +116,7 @@ } -void bssl::TRUST_TOKEN_PRETOKEN_free(TRUST_TOKEN_PRETOKEN *pretoken) { +void TRUST_TOKEN_PRETOKEN_free(TRUST_TOKEN_PRETOKEN *pretoken) { OPENSSL_free(pretoken); } @@ -513,7 +511,7 @@ return 1; } -static const struct bssl::trust_token_issuer_key_st *trust_token_issuer_get_key( +static const struct trust_token_issuer_key_st *trust_token_issuer_get_key( const TRUST_TOKEN_ISSUER *ctx, uint32_t key_id) { for (size_t i = 0; i < ctx->num_keys; i++) { if (ctx->keys[i].id == key_id) {
diff --git a/crypto/trust_token/voprf.cc b/crypto/trust_token/voprf.cc index a701a7e..42cb998 100644 --- a/crypto/trust_token/voprf.cc +++ b/crypto/trust_token/voprf.cc
@@ -29,8 +29,6 @@ #include "internal.h" -using namespace bssl; - typedef int (*hash_to_group_func_t)(const EC_GROUP *group, EC_JACOBIAN *out, const uint8_t t[TRUST_TOKEN_NONCE_SIZE]); typedef int (*hash_to_scalar_func_t)(const EC_GROUP *group, EC_SCALAR *out, @@ -195,9 +193,11 @@ return 1; } -static STACK_OF(bssl::TRUST_TOKEN_PRETOKEN) *voprf_blind( - const VOPRF_METHOD *method, CBB *cbb, size_t count, int include_message, - const uint8_t *msg, size_t msg_len) { +static STACK_OF(TRUST_TOKEN_PRETOKEN) *voprf_blind(const VOPRF_METHOD *method, + CBB *cbb, size_t count, + int include_message, + const uint8_t *msg, + size_t msg_len) { SHA512_CTX hash_ctx; const EC_GROUP *group = method->group_func(); @@ -1119,38 +1119,38 @@ static VOPRF_METHOD voprf_exp2_method = { EC_group_p384, voprf_exp2_hash_to_group, voprf_exp2_hash_to_scalar}; -int bssl::voprf_exp2_generate_key(CBB *out_private, CBB *out_public) { +int voprf_exp2_generate_key(CBB *out_private, CBB *out_public) { return voprf_generate_key(&voprf_exp2_method, out_private, out_public); } -int bssl::voprf_exp2_derive_key_from_secret(CBB *out_private, CBB *out_public, - const uint8_t *secret, - size_t secret_len) { +int voprf_exp2_derive_key_from_secret(CBB *out_private, CBB *out_public, + const uint8_t *secret, + size_t secret_len) { return voprf_derive_key_from_secret(&voprf_exp2_method, out_private, out_public, secret, secret_len); } -int bssl::voprf_exp2_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, - const uint8_t *in, size_t len) { +int voprf_exp2_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, + const uint8_t *in, size_t len) { return voprf_client_key_from_bytes(&voprf_exp2_method, key, in, len); } -int bssl::voprf_exp2_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, - const uint8_t *in, size_t len) { +int voprf_exp2_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, + const uint8_t *in, size_t len) { return voprf_issuer_key_from_bytes(&voprf_exp2_method, key, in, len); } -STACK_OF(TRUST_TOKEN_PRETOKEN) *bssl::voprf_exp2_blind(CBB *cbb, size_t count, - int include_message, - const uint8_t *msg, - size_t msg_len) { +STACK_OF(TRUST_TOKEN_PRETOKEN) *voprf_exp2_blind(CBB *cbb, size_t count, + int include_message, + const uint8_t *msg, + size_t msg_len) { return voprf_blind(&voprf_exp2_method, cbb, count, include_message, msg, msg_len); } -int bssl::voprf_exp2_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, - size_t num_requested, size_t num_to_issue, - uint8_t private_metadata) { +int voprf_exp2_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, + size_t num_requested, size_t num_to_issue, + uint8_t private_metadata) { if (private_metadata != 0) { return 0; } @@ -1158,7 +1158,7 @@ num_to_issue); } -STACK_OF(TRUST_TOKEN) *bssl::voprf_exp2_unblind( +STACK_OF(TRUST_TOKEN) *voprf_exp2_unblind( const TRUST_TOKEN_CLIENT_KEY *key, const STACK_OF(TRUST_TOKEN_PRETOKEN) *pretokens, CBS *cbs, size_t count, uint32_t key_id) { @@ -1166,11 +1166,11 @@ key_id); } -int bssl::voprf_exp2_read(const TRUST_TOKEN_ISSUER_KEY *key, - uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], - uint8_t *out_private_metadata, const uint8_t *token, - size_t token_len, int include_message, - const uint8_t *msg, size_t msg_len) { +int voprf_exp2_read(const TRUST_TOKEN_ISSUER_KEY *key, + uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], + uint8_t *out_private_metadata, const uint8_t *token, + size_t token_len, int include_message, const uint8_t *msg, + size_t msg_len) { return voprf_read(&voprf_exp2_method, key, out_nonce, token, token_len, include_message, msg, msg_len); } @@ -1195,38 +1195,38 @@ static VOPRF_METHOD voprf_pst1_method = { EC_group_p384, voprf_pst1_hash_to_group, voprf_pst1_hash_to_scalar}; -int bssl::voprf_pst1_generate_key(CBB *out_private, CBB *out_public) { +int voprf_pst1_generate_key(CBB *out_private, CBB *out_public) { return voprf_generate_key(&voprf_pst1_method, out_private, out_public); } -int bssl::voprf_pst1_derive_key_from_secret(CBB *out_private, CBB *out_public, - const uint8_t *secret, - size_t secret_len) { +int voprf_pst1_derive_key_from_secret(CBB *out_private, CBB *out_public, + const uint8_t *secret, + size_t secret_len) { return voprf_derive_key_from_secret(&voprf_pst1_method, out_private, out_public, secret, secret_len); } -int bssl::voprf_pst1_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, - const uint8_t *in, size_t len) { +int voprf_pst1_client_key_from_bytes(TRUST_TOKEN_CLIENT_KEY *key, + const uint8_t *in, size_t len) { return voprf_client_key_from_bytes(&voprf_pst1_method, key, in, len); } -int bssl::voprf_pst1_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, - const uint8_t *in, size_t len) { +int voprf_pst1_issuer_key_from_bytes(TRUST_TOKEN_ISSUER_KEY *key, + const uint8_t *in, size_t len) { return voprf_issuer_key_from_bytes(&voprf_pst1_method, key, in, len); } -STACK_OF(TRUST_TOKEN_PRETOKEN) *bssl::voprf_pst1_blind(CBB *cbb, size_t count, - int include_message, - const uint8_t *msg, - size_t msg_len) { +STACK_OF(TRUST_TOKEN_PRETOKEN) *voprf_pst1_blind(CBB *cbb, size_t count, + int include_message, + const uint8_t *msg, + size_t msg_len) { return voprf_blind(&voprf_pst1_method, cbb, count, include_message, msg, msg_len); } -int bssl::voprf_pst1_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, - size_t num_requested, size_t num_to_issue, - uint8_t private_metadata) { +int voprf_pst1_sign(const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, + size_t num_requested, size_t num_to_issue, + uint8_t private_metadata) { if (private_metadata != 0) { return 0; } @@ -1235,7 +1235,7 @@ } -int bssl::voprf_pst1_sign_with_proof_scalar_for_testing( +int voprf_pst1_sign_with_proof_scalar_for_testing( const TRUST_TOKEN_ISSUER_KEY *key, CBB *cbb, CBS *cbs, size_t num_requested, size_t num_to_issue, uint8_t private_metadata, const uint8_t *proof_scalar_buf, size_t proof_scalar_len) { @@ -1247,18 +1247,18 @@ proof_scalar_buf, proof_scalar_len); } -STACK_OF(TRUST_TOKEN) *bssl::voprf_pst1_unblind( +STACK_OF(TRUST_TOKEN) *voprf_pst1_unblind( const TRUST_TOKEN_CLIENT_KEY *key, const STACK_OF(TRUST_TOKEN_PRETOKEN) *pretokens, CBS *cbs, size_t count, uint32_t key_id) { return voprf_unblind(&voprf_pst1_method, key, pretokens, cbs, count, key_id); } -int bssl::voprf_pst1_read(const TRUST_TOKEN_ISSUER_KEY *key, - uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], - uint8_t *out_private_metadata, const uint8_t *token, - size_t token_len, int include_message, - const uint8_t *msg, size_t msg_len) { +int voprf_pst1_read(const TRUST_TOKEN_ISSUER_KEY *key, + uint8_t out_nonce[TRUST_TOKEN_NONCE_SIZE], + uint8_t *out_private_metadata, const uint8_t *token, + size_t token_len, int include_message, const uint8_t *msg, + size_t msg_len) { return voprf_read(&voprf_pst1_method, key, out_nonce, token, token_len, include_message, msg, msg_len); }
diff --git a/include/openssl/stack.h b/include/openssl/stack.h index 7cb2fb5..77c30d7 100644 --- a/include/openssl/stack.h +++ b/include/openssl/stack.h
@@ -36,7 +36,7 @@ // Defining stacks. // STACK_OF expands to the stack type for |type|. -#define STACK_OF(type) struct type##_stack_st +#define STACK_OF(type) struct stack_st_##type // DECLARE_STACK_OF declares the |STACK_OF(type)| type. It does not make the // corresponding |sk_type_*| functions available. This macro should be used in @@ -47,8 +47,6 @@ // are |type| *. This macro makes the |sk_name_*| functions available. // // It is not necessary to use |DECLARE_STACK_OF| in files which use this macro. -// -// Must be used from the global namespace. #define DEFINE_NAMED_STACK_OF(name, type) \ BORINGSSL_DEFINE_STACK_OF_IMPL(name, type *, const type *) \ BORINGSSL_DEFINE_STACK_TRAITS(name, type, false) @@ -57,36 +55,16 @@ // |type| *. This macro makes the |sk_type_*| functions available. // // It is not necessary to use |DECLARE_STACK_OF| in files which use this macro. -// -// Must be used from the global namespace. #define DEFINE_STACK_OF(type) DEFINE_NAMED_STACK_OF(type, type) // DEFINE_CONST_STACK_OF defines |STACK_OF(type)| to be a stack whose elements // are const |type| *. This macro makes the |sk_type_*| functions available. // // It is not necessary to use |DECLARE_STACK_OF| in files which use this macro. -// -// Must be used from the global namespace. #define DEFINE_CONST_STACK_OF(type) \ BORINGSSL_DEFINE_STACK_OF_IMPL(type, const type *, const type *) \ BORINGSSL_DEFINE_STACK_TRAITS(type, const type, true) -// DEFINE_NAMESPACED_STACK_OF is same as DEFINE_STACK_OF but to be used for -// internal stacks from within the bssl namespace. -#define DEFINE_NAMESPACED_STACK_OF(type) \ - BORINGSSL_DEFINE_STACK_OF_IMPL(type, type *, const type *) \ - BSSL_NAMESPACE_END \ - BORINGSSL_DEFINE_STACK_TRAITS(type, type, false) \ - BSSL_NAMESPACE_BEGIN - -// DEFINE_NAMESPACED_CONST_STACK_OF is same as DEFINE_CONST_STACK_OF but to be -// used for internal stacks from within the bssl namespace. -#define DEFINE_NAMESPACED_CONST_STACK_OF(type) \ - BORINGSSL_DEFINE_STACK_OF_IMPL(type, const type *, const type *) \ - BSSL_NAMESPACE_END \ - BORINGSSL_DEFINE_STACK_TRAITS(type, const type, true) \ - BSSL_NAMESPACE_BEGIN - // Using stacks. //