Complete the final annotation changes

3 files changed, 19 insertions, 15 deletions

diff --git a/src/lib/utils/mem_ops.h b/src/lib/utils/mem_ops.h
index 58b87b8c7..4bc57316b 100644
--- a/src/lib/utils/mem_ops.h
+++ b/src/lib/utils/mem_ops.h
@@ -38,7 +38,7 @@ BOTAN_PUBLIC_API(2,0) void secure_scrub_memory(void* ptr, size_t n);
 * @param len the number of Ts in x and y
 * @return true iff x[i] == y[i] forall i in [0...n)
 */
-BOTAN_DLL bool constant_time_compare(const uint8_t x[],
+BOTAN_PUBLIC_API(2,3) bool constant_time_compare(const uint8_t x[],
                                      const uint8_t y[],
                                      size_t len);
 
@@ -122,7 +122,7 @@ template<typename T> inline bool same_mem(const T* p1, const T* p2, size_t n)
 * @param in the read-only input buffer
 * @param length the length of the buffers
 */
-BOTAN_DLL void xor_buf(uint8_t out[],
+BOTAN_PUBLIC_API(2,3) void xor_buf(uint8_t out[],
                        const uint8_t in[],
                        size_t length);
 
@@ -133,7 +133,7 @@ BOTAN_DLL void xor_buf(uint8_t out[],
 * @param in2 the second output buffer
 * @param length the length of the three buffers
 */
-BOTAN_DLL void xor_buf(uint8_t out[],
+BOTAN_PUBLIC_API(2,3) void xor_buf(uint8_t out[],
                        const uint8_t in[],
                        const uint8_t in2[],
                        size_t length);
diff --git a/src/lib/utils/parsing.h b/src/lib/utils/parsing.h
index 32236236e..fa340f410 100644
--- a/src/lib/utils/parsing.h
+++ b/src/lib/utils/parsing.h
@@ -57,9 +57,10 @@ BOTAN_PUBLIC_API(2,0) std::string erase_chars(const std::string& str, const std:
 * @param to_char the character to replace it with
 * @return str with all instances of from_char replaced by to_char
 */
-BOTAN_PUBLIC_API(2,0) std::string replace_char(const std::string& str,
-                                   char from_char,
-                                   char to_char);
+BOTAN_PUBLIC_API(2,0)
+std::string replace_char(const std::string& str,
+                         char from_char,
+                         char to_char);
 
 /**
 * Replace a character in a string
@@ -68,9 +69,10 @@ BOTAN_PUBLIC_API(2,0) std::string replace_char(const std::string& str,
 * @param to_char the character to replace it with
 * @return str with all instances of from_chars replaced by to_char
 */
-BOTAN_PUBLIC_API(2,0) std::string replace_chars(const std::string& str,
-                                    const std::set<char>& from_chars,
-                                    char to_char);
+BOTAN_PUBLIC_API(2,0)
+std::string replace_chars(const std::string& str,
+                          const std::set<char>& from_chars,
+                          char to_char);
 
 /**
 * Join a string
@@ -78,8 +80,9 @@ BOTAN_PUBLIC_API(2,0) std::string replace_chars(const std::string& str,
 * @param delim the delimitor
 * @return string joined by delim
 */
-BOTAN_PUBLIC_API(2,0) std::string string_join(const std::vector<std::string>& strs,
-                                  char delim);
+BOTAN_PUBLIC_API(2,0)
+std::string string_join(const std::vector<std::string>& strs,
+                        char delim);
 
 /**
 * Parse an ASN.1 OID
@@ -94,8 +97,9 @@ BOTAN_PUBLIC_API(2,0) std::vector<uint32_t> parse_asn1_oid(const std::string& oi
 * @param name2 the second name
 * @return true if name1 is the same as name2 by the X.509 comparison rules
 */
-BOTAN_PUBLIC_API(2,0) bool x500_name_cmp(const std::string& name1,
-                             const std::string& name2);
+BOTAN_PUBLIC_API(2,0)
+bool x500_name_cmp(const std::string& name1,
+                   const std::string& name2);
 
 /**
 * Convert a string to a number
@@ -109,7 +113,7 @@ BOTAN_PUBLIC_API(2,0) uint32_t to_u32bit(const std::string& str);
 * @param str the string to convert
 * @return number value of the string
 */
-BOTAN_DLL uint16_t to_uint16(const std::string& str);
+BOTAN_PUBLIC_API(2,3) uint16_t to_uint16(const std::string& str);
 
 /**
 * Convert a time specification to a number
diff --git a/src/lib/utils/poly_dbl.h b/src/lib/utils/poly_dbl.h
index c79af3ada..ce62731c2 100644
--- a/src/lib/utils/poly_dbl.h
+++ b/src/lib/utils/poly_dbl.h
@@ -14,7 +14,7 @@ namespace Botan {
 /**
 * Polynomial doubling in GF(2^n)
 */
-void BOTAN_DLL poly_double_n(uint8_t out[], const uint8_t in[], size_t n);
+void BOTAN_PUBLIC_API(2,3) poly_double_n(uint8_t out[], const uint8_t in[], size_t n);
 
 inline void poly_double_n(uint8_t buf[], size_t n)
    {