Merged revisions 373059,373062 via svnmerge from

Merged revisions 373059,373062 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r373059 | mjordan | 2012-09-14 13:28:40 -0500 (Fri, 14 Sep 2012) | 16 lines

  Constify __ao2_ref_debug in astobj2

  When REF_DEBUG is enabled in certain files - most notably ccss.c - the 'tag'
  parameter passed to __ao2_ref_debug will be a const char *.  The function
  currently expects that parameter to not be const.  This causes a warning
  when compiling, as the const qualifier is being discarded.  With dev-mode
  enabled, this prevents compiling Asterisk.

  This patch makes __ao2_ref_debug's tag and file parameters const.

  (closes issue ASTERISK-20408)
  Reported by: mjordan
  ........

  Merged revisions 372959 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r373062 | mjordan | 2012-09-14 14:12:48 -0500 (Fri, 14 Sep 2012) | 30 lines

  Resolve memory leaks in TLS initialization and TLS client connections

  This patch resolves two sources of memory leaks when using TLS in Asterisk:
  1) It removes improper initialization (and multiple re-initializations) of
     portions of the SSL library.  Asterisk calls SSL_library_init and
     SSL_load_error_strings during SSL initialization; collectively this
     obviates the need for calling any of the following during initialization
     or client connection handling:
     * ERR_load_crypto_strings (handled by SSL_load_error_strings)
     * OpenSSL_add_all_algorithms (synonym for SSL_library_init)
     * SSLeay_add_ssl_algorithms (synonym for SSL_library_init)
  2) Failure to completely clean up all memory allocated by Asterisk and by
     the SSL library for TLS clients.  This included not freeing the SSL_CTX
     object in the SIP channel driver, as well as not clearing the error
     stack when the TLS client exited.

  Note that these memory leaks were found by Thomas Arimont, and this patch
  was essentially written by him with some minor tweaks.

  (closes issue AST-889)
  Reported by: Thomas Arimont
  Tested by: Thomas Arimont
  patches:
    (bugAST-889.patch) by Thomas Arimont (license 5525)

  Review: https://reviewboard.asterisk.org/r/2105
  ........

  Merged revisions 373061 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@373078 65c4cc65-6c06-0410-ace0-fbb531ad65f3