XMEMMOVE

Author: karel-m

helper.pl

@@ -51,6 +51,7 @@ sub check_source {
       push @{$troubles->{unwanted_memset}},  $lineno if $file =~ /^src\/.*\.c$/ && $l =~ /\bmemset\s*\(/;
       push @{$troubles->{unwanted_memcpy}},  $lineno if $file =~ /^src\/.*\.c$/ && $l =~ /\bmemcpy\s*\(/;
       push @{$troubles->{unwanted_memcmp}},  $lineno if $file =~ /^src\/.*\.c$/ && $l =~ /\bmemcmp\s*\(/;
+      push @{$troubles->{unwanted_memmove}}, $lineno if $file =~ /^src\/.*\.c$/ && $l =~ /\bmemmove\s*\(/;
       push @{$troubles->{unwanted_strcmp}},  $lineno if $file =~ /^src\/.*\.c$/ && $l =~ /\bstrcmp\s*\(/;
       push @{$troubles->{unwanted_clock}},   $lineno if $file =~ /^src\/.*\.c$/ && $l =~ /\bclock\s*\(/;
       push @{$troubles->{unwanted_qsort}},   $lineno if $file =~ /^src\/.*\.c$/ && $l =~ /\bqsort\s*\(/;

src/headers/tomcrypt_custom.h

@@ -24,6 +24,9 @@
 #ifndef XMEMCMP
 #define XMEMCMP  memcmp
 #endif
+#ifndef XMEMMOVE
+#define XMEMMOVE memmove
+#endif
 #ifndef XMEM_NEQ
 #define XMEM_NEQ  mem_neq
 #endif

src/pk/asn1/der/sequence/der_encode_sequence_ex.c

@@ -225,7 +225,7 @@ int der_encode_sequence_ex(ltc_asn1_list *list, unsigned long inlen,
             tmptag[4] = (unsigned char)(z&255);
             y = 5;
          }
-         memmove(out + x + y, out + x, z);
+         XMEMMOVE(out + x + y, out + x, z);
          XMEMCPY(out + x, tmptag, y);
 
          z += y;