summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Close branch better-oob-support-2.x.y.better-oob-support-2.x.ydx2017-04-060-0/+0
|
* Previously only OOB URLs attached to headline messages were processed. Now ↵Stephen Paul Weber2017-03-221-52/+70
| | | | any message can show the attached URL.
* Update a translator email addressRichard Laager2017-03-191-1/+1
|
* Bump the version and add a changelog entry for the next versionGary Kramlich2017-03-092-3/+6
|
* Added tag v2.12.0 for changeset 0241f07ed2baGary Kramlich2017-03-090-0/+0
|
* ChangeLog the external SASL fixv2.12.0Gary Kramlich2017-03-091-0/+1
|
* Added tag v2.12.0 for changeset fdf2bf2cd647Gary Kramlich2017-03-090-0/+0
|
* Add a few missed changelog entriesGary Kramlich2017-03-091-0/+2
|
* Added tag v2.12.0 for changeset 20d36ae525beGary Kramlich2017-03-090-0/+0
|
* Merge in the translations and version bumpGary Kramlich2017-03-0954-120279/+15914
|\
| * Merged in rw_grim/pidgin/release-2.x.y (pull request #180)Gary Kramlich2017-03-1054-120279/+15914
| |\ | | | | | | | | | | | | | | | Release 2.x.y Approved-by: Richard Laager
| | * Update translationsGary Kramlich2017-03-0952-81610/+10293
| | |
| | * Clean changed translationsPidgin Translators2017-03-0951-109196/+76148
| | |
| | * remove devel from the version for the releaseGary Kramlich2017-03-091-1/+1
| | |
| | * Merge the gnutls stuff with the cert updatesGary Kramlich2017-03-0714-76/+292
| | |\
| | * | ChangeLog the gnutls updateGary Kramlich2017-03-071-1/+2
| | | |
* | | | The release's source is not in UTC so reflect that in the dateGary Kramlich2017-03-081-1/+1
| | | |
* | | | Merge the pubilc codeGary Kramlich2017-03-086-0/+96
|\ \ \ \ | |/ / /
| * | | ChangeLog the gnutls updatesGary Kramlich2017-03-071-0/+1
| | |/ | |/|
| * | certificate: Use public key fingerprint to compare certificatesdx2017-03-075-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue with google talk's certificates and gnutls, where the root certificate in the provided chain is a slightly different version of the one that is usually present in the certificate stores, but the SubjectPublicKeyInfo section is the same. This adds a PurpleCertificateScheme function, compare_pubkeys, and its wrapper purple_certificate_compare_pubkeys(). This is only implemented for gnutls, since the NSS plugin only uses the NSS certificate validation code. Even if that path was reachable from a plugin that doesn't implement this method, it would return FALSE and behave as if this bug was never fixed. The gnutls implementation uses the gnutls_x509_crt_get_key_id() function, which returns a hash of the SubjectPublicKeyInfo section of the certificate. In gnutls versions older than 3.4.1, this may be a SHA1 hash, but after that version SHA256 support was added (without much fanfare - the documentation barely mentions this at all), and we just use the constant for the best known algo, which for current versions is just SHA256. Older versions ignore that flag parameter. The whole comparison is modeled after the private _gnutls_check_if_same_key(), which checks if both certificates have the same DN ("unique id") and does a memcmp() of the raw SPKI section. We don't have direct access to the raw SPKI section but comparing their fingerprints is good enough.
* | | Add the real CVE numberGary Kramlich2017-03-081-1/+1
| | |
* | | Merge in the public updatesGary Kramlich2017-03-0620-112/+239
|\ \ \ | |/ /
| * | Merged in dequisdequis/pidgin/release-2.x.y (pull request #177)Gary Kramlich2017-03-076-49/+171
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | certificate: Use SHA256 fingerprints instead of SHA1 Approved-by: Eion Robb Approved-by: Ethan Blanton Approved-by: Gary Kramlich
| | * | certificate: Use SHA256 fingerprints instead of SHA1dx2017-03-066-49/+171
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This meant adding a get_fingerprint_sha256 function to the certificate scheme structs, which meant adding a struct_size member because we ran out of reserved members there. The API-facing purple_certificate_get_fingerprint_sha256() has a fallback parameter to use sha1 if the SSL plugin doesn't implement this function (probably an outdated installation, or a third party SSL plugin). When using the function for display purposes, the fallback is disabled and it returns NULL, but when using it to compare certificates it's better to have at least the SHA1. In functions like purple_certificate_display_x509(), some slight changes to translatable strings would have been required. Since we're in a string freeze right now, I avoided those by concatenating a language-neutral "SHA256: %s" at the end of those messages. The SHA1 line used the word "fingerprint" but we can't reuse that translation. This should be cleaned up after the release.
| * | Fix some build warningsdx2017-03-068-27/+26
| |/ | | | | | | | | | | | | | | - Redefinition of DBUS_EXPORT - A whole lot of "misleading indentation" (which only appear in newer gcc) - One unused static variable in util.c (alphabet, previously used for base64) - "left shift by negative value" with the IS_END macro of libgnt. That macro is "1 << 0" and expanded to "~1 << 0" in one place. So now it's "(1 << 0)"
| * Merged in dequisdequis/pidgin/release-2.x.y (pull request #176)Gary Kramlich2017-02-232-1/+10
| |\ | | | | | | | | | | | | | | | | | | Add PURPLE_MESSAGE_REMOTE_SEND flag to PurpleMessageFlags Approved-by: Eion Robb Approved-by: Gary Kramlich
| | * Add PURPLE_MESSAGE_REMOTE_SEND flag to PurpleMessageFlagsdx2017-02-232-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifies messages like _SEND that were sent from another location, and are not echoes. This allows the UI to distinguish them from groupchat outgoing messages, since those always result in a serv_got_chat_in() call which writes to the conversation with the PURPLE_MESSAGE_SEND flag, because that's needed to display outgoing messages in UIs like pidgin, but some UIs behave differently.
| * | IRC: Skip EXTERNAL SASL auth mechanismKernc2016-09-221-0/+11
| |/ | | | | | | | | | | | | | | | | Makes Freenode and other servers that prefer SASL EXTERNAL fingerprint authentication work again. Ref: "Cannot connect to IRC (Freenode)" https://pidgin.im/pipermail/support/2016-September/029627.html
| * aim: Switch to new libpurple/finch distid/devids provided by AOLdx2017-02-224-35/+21
| | | | | | | | | | | | The pidgin ids were already handled by a previous commit. https://pidgin.im/pipermail/support/2017-January/029820.html
* | ChangeLog the security updatesGary Kramlich2017-02-281-1/+4
| |
* | Merged in ↵Gary Kramlich2017-03-011-9/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | EionRobb/security/EionRobb/fix-for-crash-when-sending-invalid-xml-e-1487474010880 (pull request #15) Fix for crash when sending invalid xml entities separated by whitespace, eg "&# 3000;" Approved-by: Gary Kramlich Approved-by: dx
| * | Use the more robust entity processing that @dequisdequis came up withEion Robb2017-02-201-9/+20
| | |
| * | Fix for crash when sending invalid xml entities separated by whitespace, eg ↵Eion Robb2017-02-191-2/+2
| |/ | | | | | | "&# 3000;"
* | Fix use of uninitialised memory if running non-debug-enabled versions of glibEion Robb2017-02-191-4/+4
|/
* Merged in Robbie/pidgin/release-2.x.y (pull request #160)Gary Kramlich2017-02-181-13/+15
|\ | | | | | | | | | | | | | | New DevID and DistID (2.x.y) Approved-by: Gary Kramlich Approved-by: Mike Ruprecht Approved-by: dx
| * Fix a typo. Thanks, Maiku.Robert Vehse2016-10-121-1/+1
| |
| * For AIM, use the DevID and the DistID supplied to us by an AOL ↵Robert Vehse2016-10-091-13/+15
| | | | | | | | representative via the devel mailing list in September 2016.
* | win32: Use `hg log` instead of `hg id --debug` on Windows tooDaniel Atallah2016-10-201-1/+1
| |
* | win32: add some sanity checks to avoid infinite loops or large memory ↵Daniel Atallah2016-10-201-2/+14
| | | | | | | | allocations when retrieving NLA responses
* | win32: Allow for arbitrary buffer size used for retrieving NLA responsesDaniel Atallah2016-10-191-14/+41
| | | | | | | | Refs #16574
* | win32: Explicitly use ANSI versions of the WSALookup APIsDaniel Atallah2016-10-191-4/+4
| |
* | Merged in dequisdequis/pidgin/release-2.x.y (pull request #155)Gary Kramlich2016-10-191-3/+3
|\ \ | | | | | | | | | Makefile: Use hg log instead of hg id --debug, which has unstable output
| * | Makefile: Use hg log instead of hg id --debug, which has unstable outputdx2016-10-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | See comments in http://stackoverflow.com/a/2485923/2195033 Also the fact that it was just broken for me - it threw debug info to stdout ("ignoring untrusted configuration option") when running 'sudo make install', which ended up in package_revision_raw.txt, which broke the build.
* | | Merged in ↵Gary Kramlich2016-10-161-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | Robbie/main/Robbie/changelog-fix-a-contributors-name-refere-1476568590680 (pull request #163) ChangeLog: Fix a contributor's name. References #16174.
| * | ChangeLog: Fix a contributor's name. References #16174.Robbie2016-10-151-1/+1
|/ /
* | Merged in rw_grim/pidgin/release-2.x.y (pull request #157)Gary Kramlich2016-10-061-3/+3
|\ \ | | | | | | | | | set the version for the 2.12.0 dev cycle
| * | we use devel not devGary Kramlich2016-10-061-1/+1
| | |
| * | Need to bump lt_current as wellGary Kramlich2016-10-051-1/+1
| | |
| * | Bump the version to 2.12.0dev which should have been done awhile ago...Gary Kramlich2016-10-051-2/+2
| |/
* | Merged in dequisdequis/pidgin/release-2.x.y (pull request #156)Gary Kramlich2016-10-061-14/+0
|\ \ | | | | | | | | | Remove call to the deprecated and stubbed gnutls_global_set_mem_functions().