Commit b1b65522 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

Conflicts:
	src/common/crypto.c
parents 57b95429 cf399f10

changes/doxygen

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Documentation changes

    - Modernize the doxygen configuration file slightly.  Fixes bug 2707.

    - Resolve all doxygen warnings except those for missing documentation.

      Fixes bug 2705.

    - Add doxygen documentation for more functions, fields, and types.

src/common/crypto.c

+0 −1
Original line number Diff line number Diff line
@@ -2711,4 +2711,3 @@ setup_openssl_threading(void) 
#endif

/** @} */

src/common/log.c

+3 −3
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, 


/** Output a message to the log.  It gets logged to all logfiles that

 * care about messages with <b>severity</b> in <b>domain</b>. The content

 * if formatted printf style 

 * is formatted printf style basedc on <b>format</b> and extra arguments.

 * */

void

tor_log(int severity, log_domain_mask_t domain, const char *format, ...)
@@ -425,8 +425,8 @@ tor_log(int severity, log_domain_mask_t domain, const char *format, ...) 
/** Output a message to the log, prefixed with a function name <b>fn</b>. */

#ifdef __GNUC__

/** GCC-based implementation of the log_fn backend, used when we have

 * variadic macros. All arguments are as for log_fn, except for <b>fn</b>, which

 * is the name of the calling functions. */

 * variadic macros. All arguments are as for log_fn, except for

 * <b>fn</b>, which is the name of the calling functions. */

void

_log_fn(int severity, log_domain_mask_t domain, const char *fn,

        const char *format, ...)

src/test/test_crypto.c

+4 −2
Original line number Diff line number Diff line
@@ -384,12 +384,14 @@ test_crypto_pk(void) 
  /* Now try signing. */

  strlcpy(data1, "Ossifrage", 1024);

  test_eq(128, crypto_pk_private_sign(pk1, data2, sizeof(data2), data1, 10));

  test_eq(10, crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128));

  test_eq(10,

          crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128));

  test_streq(data3, "Ossifrage");

  /* Try signing digests. */

  test_eq(128, crypto_pk_private_sign_digest(pk1, data2, sizeof(data2),

                                             data1, 10));

  test_eq(20, crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128));

  test_eq(20,

          crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128));

  test_eq(0, crypto_pk_public_checksig_digest(pk1, data1, 10, data2, 128));

  test_eq(-1, crypto_pk_public_checksig_digest(pk1, data1, 11, data2, 128));

src/test/test_dir.c

+3 −3

File changed.

Contains only whitespace changes.