Commit 6d728ba8 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5

parents 5b55778c 47760c7b

src/common/crypto.c

+6 −0
Original line number Diff line number Diff line
@@ -2756,6 +2756,8 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) 
  if (destlen > SIZE_T_CEILING)

    return -1;



  memset(dest, 0, destlen);



  EVP_DecodeInit(&ctx);

  EVP_DecodeUpdate(&ctx, (unsigned char*)dest, &len,

                   (unsigned char*)src, srclen);
@@ -2777,6 +2779,8 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) 
  if (destlen > SIZE_T_CEILING)

    return -1;



  memset(dest, 0, destlen);



  /* Iterate over all the bytes in src.  Each one will add 0 or 6 bits to the

   * value we're decoding.  Accumulate bits in <b>n</b>, and whenever we have

   * 24 bits, batch them into 3 bytes and flush those bytes to dest.
@@ -2956,6 +2960,8 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) 
  tor_assert((nbits/8) <= destlen); /* We need enough space. */

  tor_assert(destlen < SIZE_T_CEILING);



  memset(dest, 0, destlen);



  /* Convert base32 encoded chars to the 5-bit values that they represent. */

  tmp = tor_malloc_zero(srclen);

  for (j = 0; j < srclen; ++j) {

src/common/util.c

+3 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,9 @@ base16_decode(char *dest, size_t destlen, const char *src, size_t srclen) 
    return -1;

  if (destlen < srclen/2 || destlen > SIZE_T_CEILING)

    return -1;



  memset(dest, 0, destlen);



  end = src+srclen;

  while (src<end) {

    v1 = hex_decode_digit_(*src);