Namespace decrepit/cast's internal symbols. Down from 994 to 986 unintended exported symbols. Bug: 42220000 Change-Id: I326ad50b16e13629ffb29f700cbbd81e87fa93ba Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/86307 Commit-Queue: Rudolf Polzer <rpolzer@google.com> Reviewed-by: Xiangfei Ding <xfding@google.com>
diff --git a/decrepit/cast/cast.cc b/decrepit/cast/cast.cc index 71dc356..a2262c2 100644 --- a/decrepit/cast/cast.cc +++ b/decrepit/cast/cast.cc
@@ -26,6 +26,8 @@ #include "internal.h" +using namespace bssl; + void CAST_ecb_encrypt(const uint8_t *in, uint8_t *out, const CAST_KEY *ks, int enc) { uint32_t d[2]; @@ -200,10 +202,10 @@ a[n + 2] = (l >> 8) & 0xff; \ a[n + 1] = (l >> 16) & 0xff; \ a[n + 0] = (l >> 24) & 0xff; -#define S4 CAST_S_table4 -#define S5 CAST_S_table5 -#define S6 CAST_S_table6 -#define S7 CAST_S_table7 +#define S4 bssl::CAST_S_table4 +#define S5 bssl::CAST_S_table5 +#define S6 bssl::CAST_S_table6 +#define S7 bssl::CAST_S_table7 void CAST_set_key(CAST_KEY *key, size_t len, const uint8_t *data) { uint32_t x[16];
diff --git a/decrepit/cast/cast_tables.cc b/decrepit/cast/cast_tables.cc index fceb100..c560fa9 100644 --- a/decrepit/cast/cast_tables.cc +++ b/decrepit/cast/cast_tables.cc
@@ -17,7 +17,9 @@ #include "internal.h" -const uint32_t CAST_S_table0[256] = { +using namespace bssl; + +const uint32_t bssl::CAST_S_table0[256] = { 0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949, 0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e, 0x28683b6f, 0xc07fd059, @@ -63,7 +65,7 @@ 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf, }; -const uint32_t CAST_S_table1[256] = { +const uint32_t bssl::CAST_S_table1[256] = { 0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651, 0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3, 0xa0b52f7b, 0x59e83605, @@ -109,7 +111,7 @@ 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1, }; -const uint32_t CAST_S_table2[256] = { +const uint32_t bssl::CAST_S_table2[256] = { 0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90, 0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5, 0x11107d9f, 0x07647db9, @@ -155,7 +157,7 @@ 0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783, }; -const uint32_t CAST_S_table3[256] = { +const uint32_t bssl::CAST_S_table3[256] = { 0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1, 0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf, 0x28147f5f, 0x4fa2b8cd, @@ -201,7 +203,7 @@ 0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2, }; -const uint32_t CAST_S_table4[256] = { +const uint32_t bssl::CAST_S_table4[256] = { 0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911, 0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f, 0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00, 0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a, 0xe6a2e77f, 0xf0c720cd, @@ -247,7 +249,7 @@ 0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4, }; -const uint32_t CAST_S_table5[256] = { +const uint32_t bssl::CAST_S_table5[256] = { 0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c, 0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac, 0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9, 0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138, 0x33f14961, 0xc01937bd, @@ -293,7 +295,7 @@ 0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f, }; -const uint32_t CAST_S_table6[256] = { +const uint32_t bssl::CAST_S_table6[256] = { 0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693, 0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f, 0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82, 0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de, 0xa05fbcf6, 0xcd4181e9, @@ -339,7 +341,7 @@ 0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3, }; -const uint32_t CAST_S_table7[256] = { +const uint32_t bssl::CAST_S_table7[256] = { 0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095, 0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5, 0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174, 0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc, 0xde9adeb1, 0x0a0cc32c,
diff --git a/decrepit/cast/internal.h b/decrepit/cast/internal.h index 5bbf6052..680102d 100644 --- a/decrepit/cast/internal.h +++ b/decrepit/cast/internal.h
@@ -17,10 +17,8 @@ #include <openssl/base.h> -#if defined(__cplusplus) -extern "C" { -#endif +BSSL_NAMESPACE_BEGIN extern const uint32_t CAST_S_table0[256]; extern const uint32_t CAST_S_table1[256]; @@ -31,9 +29,6 @@ extern const uint32_t CAST_S_table6[256]; extern const uint32_t CAST_S_table7[256]; - -#if defined(__cplusplus) -} // extern C -#endif +BSSL_NAMESPACE_END #endif // OPENSSL_HEADER_CAST_INTERNAL_H