diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 15:22:43 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-08 15:22:43 +0000 |
commit | dcaf9225a32b5699e13dc51bd847e17b953a647a (patch) | |
tree | da5ac0468a78263babaf1ce1fe000eea765a2811 /main/Makefile | |
parent | 1191562945bd297f501b4e4831ba75c6c111dfdc (diff) |
Merged revisions 205120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r205120 | russell | 2009-07-08 10:17:19 -0500 (Wed, 08 Jul 2009) | 16 lines
Move OpenSSL initialization to a single place, make library usage thread-safe.
While doing some reading about OpenSSL, I noticed a couple of things that
needed to be improved with our usage of OpenSSL.
1) We had initialization of the library done in multiple modules. This has now
been moved to a core function that gets executed during Asterisk startup.
We already link OpenSSL into the core for TCP/TLS functionality, so this
was the most logical place to do it.
2) OpenSSL is not thread-safe by default. However, making it thread safe is
very easy. We just have to provide a couple of callbacks. One callback
returns a thread ID. The other handles locking. For more information,
start with the "Is OpenSSL thread-safe?" question on the FAQ page of
openssl.org.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@205139 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
-rw-r--r-- | main/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index bc4054e51..654fde0e7 100644 --- a/main/Makefile +++ b/main/Makefile @@ -28,7 +28,7 @@ OBJS= tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \ cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \ strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \ astobj2.o hashtab.o global_datastores.o version.o \ - features.o poll.o + features.o poll.o ssl.o # we need to link in the objects statically, not as a library, because # otherwise modules will not have them available if none of the static |