2 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/pk_pad/eme_oaep/oaep.cpp b/src/lib/pk_pad/eme_oaep/oaep.cpp
index b114afb8b..370a9fe45 100644
--- a/src/lib/pk_pad/eme_oaep/oaep.cpp
+++ b/src/lib/pk_pad/eme_oaep/oaep.cpp
@@ -84,7 +84,7 @@ secure_vector<byte> OAEP::unpad(const byte in[], size_t in_length,
    secure_vector<byte> input(key_length);
    buffer_insert(input, key_length - in_length, in, in_length);
 
-   BOTAN_CONST_TIME_POISON(input.data(), input.size());
+   CT::poison(input.data(), input.size());
 
    const size_t hlen = m_Phash.size();
 
@@ -102,25 +102,25 @@ secure_vector<byte> OAEP::unpad(const byte in[], size_t in_length,
 
    for(size_t i = delim_idx; i < input.size(); ++i)
       {
-      const byte zero_m = ct_is_zero_8(input[i]);
-      const byte one_m = ct_is_equal_8(input[i], 1);
+      const byte zero_m = CT::is_zero<byte>(input[i]);
+      const byte one_m = CT::is_equal<byte>(input[i], 1);
 
       const byte add_m = waiting_for_delim & zero_m;
 
       bad_input |= waiting_for_delim & ~(zero_m | one_m);
 
-      delim_idx += ct_select_mask_8(add_m, 1, 0);
+      delim_idx += CT::select<byte>(add_m, 1, 0);
 
       waiting_for_delim &= zero_m;
       }
 
    // If we never saw any non-zero byte, then it's not valid input
    bad_input |= waiting_for_delim;
-   bad_input |= ct_expand_mask_8(!same_mem(&input[hlen], m_Phash.data(), hlen));
+   bad_input |= CT::expand_mask<byte>(!same_mem(&input[hlen], m_Phash.data(), hlen));
 
-   BOTAN_CONST_TIME_UNPOISON(input.data(), input.size());
-   BOTAN_CONST_TIME_UNPOISON(&bad_input, sizeof(bad_input));
-   BOTAN_CONST_TIME_UNPOISON(&delim_idx, sizeof(delim_idx));
+   CT::unpoison(input.data(), input.size());
+   CT::unpoison(&bad_input, 1);
+   CT::unpoison(&delim_idx, 1);
 
    if(bad_input)
       throw Decoding_Error("Invalid OAEP encoding");
diff --git a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
index 219e93251..6b3bce0aa 100644
--- a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
+++ b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
@@ -44,29 +44,29 @@ secure_vector<byte> EME_PKCS1v15::unpad(const byte in[], size_t inlen,
    if(inlen != key_len / 8 || inlen < 10)
       throw Decoding_Error("PKCS1::unpad");
 
-   BOTAN_CONST_TIME_POISON(in, inlen);
+   CT::poison(in, inlen);
 
    byte bad_input_m = 0;
    byte seen_zero_m = 0;
    size_t delim_idx = 0;
 
-   bad_input_m |= ~ct_is_equal_8(in[0], 2);
+   bad_input_m |= ~CT::is_equal<byte>(in[0], 2);
 
    for(size_t i = 1; i != inlen; ++i)
       {
-      const byte is_zero_m = ct_is_zero_8(in[i]);
+      const byte is_zero_m = CT::is_zero<byte>(in[i]);
 
-      delim_idx += ct_select_mask_8(~seen_zero_m, 1, 0);
+      delim_idx += CT::select<byte>(~seen_zero_m, 1, 0);
 
-      bad_input_m |= is_zero_m & ct_expand_mask_8(i < 9);
+      bad_input_m |= is_zero_m & CT::expand_mask<byte>(i < 9);
       seen_zero_m |= is_zero_m;
       }
 
    bad_input_m |= ~seen_zero_m;
 
-   BOTAN_CONST_TIME_UNPOISON(in, inlen);
-   BOTAN_CONST_TIME_UNPOISON(&bad_input_m, sizeof(bad_input_m));
-   BOTAN_CONST_TIME_UNPOISON(&delim_idx, sizeof(delim_idx));
+   CT::unpoison(in, inlen);
+   CT::unpoison(&bad_input_m, 1);
+   CT::unpoison(&delim_idx, 1);
 
    if(bad_input_m)
       throw Decoding_Error("Invalid PKCS #1 v1.5 encryption padding");