You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Automerge script 74bea2a92c 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		14 years ago
..
editline	Multiple revisions 365155,365160,365299,365320,365399,365475,365478,365575,365632,365701,365898,365990,366049,366053,366106,366168,366241,366297,366390,366412,366591,366598,366741,366792,366881,366884,366948,367003,367028,367267,367299,367369,367417,367470,367562,367679,367731,367782,367844,367907,367978,367981,368042,368093,368267,368310,368407,368470,368499,368524,368536,368568,368587	14 years ago
stdtime	Merged revisions 369005 via svnmerge from	14 years ago
Makefile	Merged revisions 372695 via svnmerge from	14 years ago
abstract_jb.c	Merged revisions 369005 via svnmerge from	14 years ago
acl.c	Merged revisions 369005 via svnmerge from	14 years ago
adsi.c	Merged revisions 369391 via svnmerge from	14 years ago
alaw.c	Merged revisions 369005 via svnmerge from	14 years ago
aoc.c	Merged revisions 369005 via svnmerge from	14 years ago
app.c	Merged revisions 370643 via svnmerge from	14 years ago
ast_expr2.c	Multiple revisions 360356-360357	14 years ago
ast_expr2.fl	Merged revisions 309808 via svnmerge from	15 years ago
ast_expr2.h	Multiple revisions 360356-360357	14 years ago
ast_expr2.y	Multiple revisions 360356-360357	14 years ago
ast_expr2f.c	Multiple revisions 360356-360357	14 years ago
asterisk.c	Merged revisions 372885 via svnmerge from	14 years ago
asterisk.dynamics	Remove the old stub files, preferring the optional_api method.	16 years ago
asterisk.exports.in	Merged revisions 288640 via svnmerge from	16 years ago
astfd.c	Merged revisions 369005 via svnmerge from	14 years ago
astmm.c	Merged revisions 372656 via svnmerge from	14 years ago
astobj2.c	Merged revisions 373059,373062 via svnmerge from	14 years ago
audiohook.c	Merged revisions 369005 via svnmerge from	14 years ago
autochan.c	Merged revisions 369005 via svnmerge from	14 years ago
autoservice.c	Merged revisions 369005 via svnmerge from	14 years ago
bridging.c	Merged revisions 369709 via svnmerge from	14 years ago
buildinfo.c	fix a few small things found by using sparse	18 years ago
callerid.c	Merged revisions 370643 via svnmerge from	14 years ago
ccss.c	Merged revisions 370184 via svnmerge from	14 years ago
cdr.c	Merged revisions 369369 via svnmerge from	14 years ago
cel.c	Merged revisions 370271,370274,370277 via svnmerge from	14 years ago
channel.c	Merged revisions 373025 via svnmerge from	14 years ago
chanvars.c	Merged revisions 369005 via svnmerge from	14 years ago
cli.c	Merged revisions 369005 via svnmerge from	14 years ago
config.c	Merged revisions 371394,371398 via svnmerge from	14 years ago
custom_control_frame.c	Update everything in the main directory for Digium phone additions.	14 years ago
cygload.c	…
data.c	Merged revisions 369005 via svnmerge from	14 years ago
datastore.c	Merged revisions 369005 via svnmerge from	14 years ago
db.c	Merged revisions 370643 via svnmerge from	14 years ago
devicestate.c	Merged revisions 369005 via svnmerge from	14 years ago
dial.c	Merged revisions 369005 via svnmerge from	14 years ago
dns.c	Merged revisions 369005 via svnmerge from	14 years ago
dnsmgr.c	Merged revisions 369005 via svnmerge from	14 years ago
dsp.c	Merged revisions 372372 via svnmerge from	14 years ago
ecdisa.h	…
enum.c	Merged revisions 369005 via svnmerge from	14 years ago
event.c	Merged revisions 370643 via svnmerge from	14 years ago
features.c	Merged revisions 372841 via svnmerge from	14 years ago
file.c	Merged revisions 371591 via svnmerge from	14 years ago
fixedjitterbuf.c	Merged revisions 369005 via svnmerge from	14 years ago
fixedjitterbuf.h	Merged revisions 135841,135847,135850 via svnmerge from	18 years ago
format.c	Merged revisions 369005 via svnmerge from	14 years ago
format_cap.c	Merged revisions 369005 via svnmerge from	14 years ago
format_pref.c	Merged revisions 369005 via svnmerge from	14 years ago
frame.c	Merged revisions 370430,370432 via svnmerge from	14 years ago
framehook.c	Merged revisions 369005 via svnmerge from	14 years ago
fskmodem.c	Merged revisions 369005 via svnmerge from	14 years ago
fskmodem_float.c	Merged revisions 369005 via svnmerge from	14 years ago
fskmodem_int.c	Merged revisions 369005 via svnmerge from	14 years ago
global_datastores.c	Merged revisions 369005 via svnmerge from	14 years ago
hashtab.c	Merged revisions 369005 via svnmerge from	14 years ago
heap.c	Merged revisions 369005 via svnmerge from	14 years ago
http.c	Merged revisions 371529 via svnmerge from	14 years ago
image.c	Merged revisions 369005 via svnmerge from	14 years ago
indications.c	Merged revisions 369005 via svnmerge from	14 years ago
io.c	Merged revisions 369005 via svnmerge from	14 years ago
jitterbuf.c	Merged revisions 369005 via svnmerge from	14 years ago
loader.c	Merged revisions 371437 via svnmerge from	14 years ago
lock.c	Merged revisions 371719 via svnmerge from	14 years ago
logger.c	Merged revisions 370643 via svnmerge from	14 years ago
manager.c	Merged revisions 372338,372341,372358 via svnmerge from	14 years ago
md5.c	Multiple revisions 368721,368739,368760,368808	14 years ago
message.c	Merged revisions 372885 via svnmerge from	14 years ago
netsock.c	Merged revisions 369005 via svnmerge from	14 years ago
netsock2.c	Merged revisions 369109 via svnmerge from	14 years ago
pbx.c	Merged revisions 372338,372341,372358 via svnmerge from	14 years ago
plc.c	Merged revisions 369005 via svnmerge from	14 years ago
poll.c	Merged revisions 285268 via svnmerge from	16 years ago
presencestate.c	Update everything in the main directory for Digium phone additions.	14 years ago
privacy.c	Merged revisions 369005 via svnmerge from	14 years ago
rtp_engine.c	Merged revisions 369511 via svnmerge from	14 years ago
say.c	Merged revisions 370643 via svnmerge from	14 years ago
sched.c	Merged revisions 369005 via svnmerge from	14 years ago
security_events.c	Merged revisions 369005 via svnmerge from	14 years ago
sha1.c	Update SHA1 code to RFC 6234	15 years ago
slinfactory.c	Merged revisions 369005 via svnmerge from	14 years ago
srv.c	Merged revisions 369005 via svnmerge from	14 years ago
ssl.c	Merged revisions 373059,373062 via svnmerge from	14 years ago
strcompat.c	Merged revisions 370643 via svnmerge from	14 years ago
strings.c	Merged revisions 369005 via svnmerge from	14 years ago
stun.c	Merged revisions 369005 via svnmerge from	14 years ago
syslog.c	Merged revisions 369005 via svnmerge from	14 years ago
taskprocessor.c	Merged revisions 369005 via svnmerge from	14 years ago
tcptls.c	Merged revisions 373059,373062 via svnmerge from	14 years ago
tdd.c	Merged revisions 369005 via svnmerge from	14 years ago
term.c	Merged revisions 369005 via svnmerge from	14 years ago
test.c	Merged revisions 369005 via svnmerge from	14 years ago
threadstorage.c	Merged revisions 370643 via svnmerge from	14 years ago
timing.c	Merged revisions 369005 via svnmerge from	14 years ago
translate.c	Merged revisions 369005 via svnmerge from	14 years ago
udptl.c	Merged revisions 371545 via svnmerge from	14 years ago
ulaw.c	Merged revisions 369005 via svnmerge from	14 years ago
utils.c	Merged revisions 371691 via svnmerge from	14 years ago
xml.c	Merged revisions 369005 via svnmerge from	14 years ago
xmldoc.c	Merged revisions 371591 via svnmerge from	14 years ago