Changeset 8e9e2b7 for doc/README


Ignore:
Timestamp:
2010-10-03T02:45:26Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
04f0c10
Parents:
88de0c9 (diff), 2af3e23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/README

    r88de0c9 r8e9e2b7  
    7171--otr=1 or --otr=0 to force it on or off, respectively.
    7272
    73 These days, MSN Messenger clients have to connect to the MS Passport servers
    74 through HTTPS. BitlBee can use several SSL libraries for this: GnuTLS, NSS
    75 (which comes with Mozilla) and OpenSSL. OpenSSL is not GPL-compatible in some
    76 situations, so using GnuTLS or NSS is preferred. However, especially on *BSD,
    77 OpenSSL can be considered part of the operating system, which eliminates the
    78 GPL incompatibility.
     73These days, many IM protocols use SSL/TLS connections (for authentication
     74or for the whole session). BitlBee can use several SSL libraries for this:
     75GnuTLS, NSS (which comes with Mozilla) and OpenSSL. OpenSSL is not GPL-
     76compatible in some situations, so using GnuTLS is preferred. However,
     77especially on *BSD, OpenSSL can be considered part of the operating system,
     78which eliminates the GPL incompatibility.
    7979
    8080The incompatibility is also the reason why the SSL library detection code
Note: See TracChangeset for help on using the changeset viewer.