Commit ced06a80 authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Merge remote-tracking branch 'origin/maint-0.2.2'

parents 1f7b9e61 d29c2eb9
Loading
Loading
Loading
Loading
+7 −7
Changes for src/common/di_ops.c: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -3,18 +3,18 @@

/**
 * \file di_ops.c
 * \brief Functions for data-independent operations
 * \brief Functions for data-independent operations.
 **/

#include "orconfig.h"
#include "di_ops.h"

/**
 * Timing-safe version of memcmp.  As memcmp, compare the <b>sz</b> bytes
 * at <b>a</b> with the <b>sz</b> bytes at <b>, and returns less than 0 if the
 * bytes at <b>a</b> lexically precede those at <b>b</b>, 0 if the byte ranges
 * are equal, and greater than zero if the bytes at <b>a</b> lexically follow
 * those at <b>.
 * Timing-safe version of memcmp.  As memcmp, compare the <b>sz</b> bytes at
 * <b>a</b> with the <b>sz</b> bytes at <b>b</b>, and return less than 0 if
 * the bytes at <b>a</b> lexically precede those at <b>b</b>, 0 if the byte
 * ranges are equal, and greater than zero if the bytes at <b>a</b> lexically
 * follow those at <b>b</b>.
 *
 * This implementation differs from memcmp in that its timing behavior is not
 * data-dependent: it should return in the same amount of time regardless of
@@ -85,7 +85,7 @@ tor_memcmp(const void *a, const void *b, size_t len)

/**
 * Timing-safe memory comparison.  Return true if the <b>sz</b> bytes at
 * <b>a</b> are the same as the <b>sz</b> bytes at <b>, and 0 otherwise.
 * <b>a</b> are the same as the <b>sz</b> bytes at <b>b</b>, and 0 otherwise.
 *
 * This implementation differs from !memcmp(a,b,sz) in that its timing
 * behavior is not data-dependent: it should return in the same amount of time