aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
| * if EC_KEY_check_key fails consume errors off stack (+ add test)Paul Kehrer2014-10-142-1/+17
|/
* Merge pull request #1397 from alex/looser-dsaPaul Kehrer2014-10-142-110/+4
|\ | | | | Fixed #1392 -- allow more combinations of p and q's bit lengths
| * Fixed #1392 -- allow more combinations of p and q's bit lengthsAlex Gaynor2014-10-132-110/+4
| |
* | Merge pull request #1395 from Ayrx/update-faqPaul Kehrer2014-10-111-29/+0
|\ \ | |/ |/| Remove outdated information from FAQ.
| * Remove outdated information from FAQ.Terry Chia2014-10-111-29/+0
|/
* Merge pull request #1393 from alex/clean-up-error-messageAlex Stapleton2014-10-091-3/+6
|\ | | | | Improved error message
| * Improved error messageAlex Gaynor2014-10-081-3/+6
| |
* | Merge pull request #1391 from alex/clean-up-testPaul Kehrer2014-10-091-3/+0
|\ \ | |/ |/| Remove the EC PARAMETERS section from the PEM
| * Remove the EC PARAMETERS section from the PEMAlex Gaynor2014-10-081-3/+0
|/
* Merge pull request #1384 from reaperhulk/fix-1382Alex Gaynor2014-10-033-18/+58
|\ | | | | enable truncation for DSA digests prior to signing
| * update comment with info re: 0.9.8Paul Kehrer2014-10-031-1/+2
| |
| * add the missing file. i are senior dvlprPaul Kehrer2014-10-031-0/+35
| |
| * enable truncation for DSA digests prior to signingPaul Kehrer2014-10-032-18/+22
| | | | | | | | | | | | This works around a bug in OpenSSL 1.0.0, 1.0.0a, and 1.0.0b where SHA-2 is a supported signature algorithm but FIPS 186-3 truncation is not performed if the q value is smaller than the digest output length
* | Merge pull request #1383 from maxking/masterAlex Gaynor2014-10-022-0/+203
|\ \ | |/ |/| Add license to cryptography_vectors tarball; solves #1377
| * Add license to cryptography_vectors tarball; solves #1377maxking2014-10-022-0/+203
|/
* Merge pull request #1381 from alex/stop-generating-keysPaul Kehrer2014-10-011-21/+6
|\ | | | | Replace key generation with fixture usage in some tests