aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1422 from alex/multi-fernetDavid Reid2014-10-214-4/+91
|\ | | | | Fixes #1327 -- adds multifernet
| * added docs stuff on when addedAlex Gaynor2014-10-202-0/+4
| |
| * Merge branch 'master' into multi-fernetAlex Gaynor2014-10-207-26/+70
| |\ | |/ |/|
* | Merge pull request #1423 from alex/pr/1396Paul Kehrer2014-10-207-26/+67
|\ \ | | | | | | Add MACContext and switch HMAC and CMAC to use it
| * | A few docs formatting nitsAlex Gaynor2014-10-201-4/+5
| | |
| * | Add to changelog. Document deprecation.Terry Chia2014-10-201-4/+3
| | |
| * | Add to changelog. Document deprecation.Terry Chia2014-10-205-2/+7
| | |
| * | Remove algorithm property from MACContext and alias CMACContext.Terry Chia2014-10-201-27/+2
| | |
| * | Add missing period.Terry Chia2014-10-201-1/+1
| | |
| * | Add docs.Terry Chia2014-10-202-3/+26
| | |
| * | Ooops.Terry Chia2014-10-201-1/+1
| | |
| * | Add MACContext and make HMAC and CMAC to use it.Terry Chia2014-10-205-3/+41
|/ /
* | Merge pull request #1420 from alex/document-pq-thingsPaul Kehrer2014-10-201-0/+3
|\ \ | | | | | | Document the change in ``p`` and ``q``s lengths in the CHANGELOG
| * | Document the change in ``p`` and ``q``s lengths in the CHANGELOGAlex Gaynor2014-10-191-0/+3
| | |
| | * flake8 + cleanupAlex Gaynor2014-10-201-7/+6
| | |
| | * Handle non-iterable arguments reasonableAlex Gaynor2014-10-202-0/+5
| | |
| | * improved the error messageAlex Gaynor2014-10-201-1/+3
| | |
| | * Added docs for multifernetAlex Gaynor2014-10-201-3/+31
| | |
| | * Fixes #1327 -- adds multifernetAlex Gaynor2014-10-202-1/+50
| |/ |/|
* | Merge pull request #1421 from alex/fix-bugPaul Kehrer2014-10-202-3/+8
|\ \ | | | | | | Fixed an issue in fernet where the wrong exception would occur on an all-nulls input.
| * | eep, stray spaceAlex Gaynor2014-10-191-1/+1
| | |
| * | Fixed an issue in fernet where the wrong exception would occur on an ↵Alex Gaynor2014-10-192-3/+8
|/ / | | | | | | | | | | all-nulls input. Also switched a few tests to not generate a key
* | Merge pull request #1419 from alex/cleanup-fernetPaul Kehrer2014-10-191-52/+11
|\ \ | | | | | | Move the supported marks to class level for fernet
| * | Move the supported marks to class level for fernetAlex Gaynor2014-10-191-52/+11
| | |
* | | Merge pull request #1418 from alex/fix-ec-complainsPaul Kehrer2014-10-192-0/+27
|\ \ \ | |_|/ |/| | Fixes #1416 -- replaced assertions with error checking in EC key from numbers.
| * | Do these checks in pure python eagerly.Alex Gaynor2014-10-191-5/+7
| | | | | | | | | | | | We get errors in different places, depending on py2k vs. py3k if we don't.
| * | Fixes #1416 -- replaced assertions with error checking in EC key from numbers.Alex Gaynor2014-10-192-2/+27
| |/ | | | | | | Includes tests.
* | Merge pull request #1417 from reaperhulk/fix-interfaceAlex Gaynor2014-10-191-0/+12
|\ \ | |/ |/| add missing signer/verifier to DSAPublicKey and DSAPrivateKey ifaces
| * add missing signer/verifier to DSAPublicKey and DSAPrivateKey ifacesPaul Kehrer2014-10-191-0/+12
| | | | | | | | | | These were present in the docs and the OpenSSL provider, but not properly listed on the interface
* | Merge pull request #1415 from alex/assert-simplificationPaul Kehrer2014-10-191-4/+2
|\ \ | |/ |/| Split this assert into two.
| * Split this assert into two.Alex Gaynor2014-10-191-4/+2
| | | | | | | | | | | | If these fail, py.test can vomit: https://bitbucket.org/hpk42/pytest/issue/612/syntax-error-on-assertion-reinterpretation (I lost track of what I did to make this asseriton vomit unfortunately :-()
* | Merge pull request #1414 from reaperhulk/new-nidsAlex Gaynor2014-10-191-4/+29
|\ \ | |/ |/| start adding NIDs we'll need for X509
| * remove nids not universally available in all our versionsPaul Kehrer2014-10-191-10/+0
| | | | | | | | will re-add later with additional boilerplate
| * compilation fixesPaul Kehrer2014-10-181-3/+2
| |
| * start adding NIDs we'll need for X509Paul Kehrer2014-10-181-4/+40
|/
* Merge pull request #1412 from reaperhulk/update-osx-flagsAlex Stapleton2014-10-161-5/+2
|\ | | | | Remove some (probably) unneeded flags in travis config
| * we shouldn't need the unused arguments flags any more.Paul Kehrer2014-10-151-5/+2
| |
* | Merge pull request #1399 from skeuomorf/skeuomorf-gpg-fingerprintAlex Stapleton2014-10-161-1/+1
|\ \ | | | | | | Add gpg key fingerprint for skeuomorf
| * | Add gpg key fingerprint for skeuomorfMohammed Attia2014-10-151-1/+1
| | |
* | | Merge pull request #1410 from reaperhulk/port-changelogAlex Stapleton2014-10-161-0/+11
|\ \ \ | | | | | | | | add 0.6.1 changelog to master
| * | | add 0.6.1 changelog to masterPaul Kehrer2014-10-151-0/+11
| | | |
* | | | Merge pull request #1411 from reaperhulk/update-opensslsAlex Stapleton2014-10-161-2/+2
|\ \ \ \ | |/ / / |/| | | update OpenSSL versions we test against in the docs
| * | | update OpenSSL versions we test against in the docsPaul Kehrer2014-10-151-2/+2
|/ / /
* | | Merge pull request #1407 from alex/happy-freebsdPaul Kehrer2014-10-151-1/+1
|\ \ \ | |_|/ |/| | Make FreeBSD happy with this constant
| * | Make FreeBSD happy with this constantAlex Gaynor2014-10-151-1/+1
|/ /
* | Merge pull request #1405 from alex/fix-pkcs12-decrypt-failuresPaul Kehrer2014-10-154-14/+43
|\ \ | |/ |/| Handle PKCS12 decrypt failures with OpenSSL 1.0.1j
| * upgrade openssl to 1.0.1j on travisAlex Gaynor2014-10-151-6/+6
| |
| * Also handle the changes in the PKCS1v15 errorsAlex Gaynor2014-10-152-4/+20
| |
| * Handle PKCS12 decrypt failures with OpenSSL 1.0.1jAlex Gaynor2014-10-152-4/+17
|/ | | | Don't know why this changed, but it did.
* Merge pull request #1398 from reaperhulk/fix-1389Alex Gaynor2014-10-142-1/+17
|\ | | | | if EC_KEY_check_key fails consume errors off stack (+ add test)