Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge encryption #128

Merged
merged 103 commits into from
Dec 30, 2015
Merged

Merge encryption #128

merged 103 commits into from
Dec 30, 2015

Commits on Jun 20, 2014

  1. Initial commit

    @martinthomson
    martinthomson committed Jun 20, 2014
    Configuration menu
    Copy the full SHA
    cbc7a7e View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2014

  1. Initial version

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    621c6e7 View commit details
    Browse the repository at this point in the history

  2. 24825

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    45e65ef View commit details
    Browse the repository at this point in the history

  3. Update

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    f3198d5 View commit details
    Browse the repository at this point in the history

  4. Update to show location of key

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    ddeebfc View commit details
    Browse the repository at this point in the history

  5. Noting manual maintenance options

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    3f1ef18 View commit details
    Browse the repository at this point in the history

  6. Updating README

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    c1b3596 View commit details
    Browse the repository at this point in the history

  7. Adding panache

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    e8fc4d4 View commit details
    Browse the repository at this point in the history

  8. Travis speedup

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    9f085a1 View commit details
    Browse the repository at this point in the history

  9. Missing var

    @martinthomson
    martinthomson committed Jun 21, 2014
    Configuration menu
    Copy the full SHA
    f7efba4 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2014

  1. Updates based on testing

    @martinthomson
    martinthomson committed Jun 23, 2014
    Configuration menu
    Copy the full SHA
    1143cc3 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2014

  1. Fixing formatting

    @martinthomson
    martinthomson committed Jun 24, 2014
    Configuration menu
    Copy the full SHA
    93f36cf View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2014

  1. Fixing draft name selection

    @martinthomson
    martinthomson committed Jun 26, 2014
    Configuration menu
    Copy the full SHA
    3f35e40 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2014

  1. Sorting to get the right answer

    @martinthomson
    martinthomson committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    f91ee0b View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2014

  1. Tweaks

    @martinthomson
    martinthomson committed Jul 31, 2014
    Configuration menu
    Copy the full SHA
    056169d View commit details
    Browse the repository at this point in the history

  2. Now supports drafts authored using outline.el (i.e. draft-*.org)

    Kent Watsen committed Jul 31, 2014
    Configuration menu
    Copy the full SHA
    ad811bf View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. Fixed ordering issue found by Martin. 

    Added links for tools called by Makefile.
Added outline as an input format.
    Kent Watsen committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    3744cdc View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2014

  1. Merge pull request #2 from kwatsen/master 

    Now supports drafts authored using outline.el (i.e. draft-*.org)
    @martinthomson
    martinthomson committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    cb25dc4 View commit details
    Browse the repository at this point in the history

  2. Adding rfcdiff

    @palerikm @martinthomson
    palerikm authored and martinthomson committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    c786205 View commit details
    Browse the repository at this point in the history

  3. More toying with Makefile an diff cration.

    @palerikm @martinthomson
    palerikm authored and martinthomson committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    1b791a8 View commit details
    Browse the repository at this point in the history

  4. Based on input from Martin.

    @palerikm @martinthomson
    palerikm authored and martinthomson committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    5e32d11 View commit details
    Browse the repository at this point in the history

  5. Fixing intermediate handling

    @martinthomson
    martinthomson committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    fccb949 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2014

  1. Adding update target

    @martinthomson
    martinthomson committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    35084eb View commit details
    Browse the repository at this point in the history

  2. Permitting local changes to files

    @martinthomson
    martinthomson committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    f2a4262 View commit details
    Browse the repository at this point in the history

  3. I don't like using if in Makefile shells

    @martinthomson
    martinthomson committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    3035e38 View commit details
    Browse the repository at this point in the history

  4. Getting revisions right

    @martinthomson
    martinthomson committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    64179e5 View commit details
    Browse the repository at this point in the history

  5. Removing ugly sed hack

    @martinthomson
    martinthomson committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    0154e86 View commit details
    Browse the repository at this point in the history

  6. Removing false error

    @martinthomson
    martinthomson committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    4302b05 View commit details
    Browse the repository at this point in the history

  7. Fixing ordering

    @martinthomson
    martinthomson committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    ef1788d View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2014

  1. Updating to include PDF

    @martinthomson
    martinthomson committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    ae6119f View commit details
    Browse the repository at this point in the history

  2. Updating README

    @martinthomson
    martinthomson committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    8c7169b View commit details
    Browse the repository at this point in the history

  3. Fixing variables on HTML

    @martinthomson
    martinthomson committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    7ea7369 View commit details
    Browse the repository at this point in the history

  4. ignoring pdf

    @martinthomson
    martinthomson committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    ffa5117 View commit details
    Browse the repository at this point in the history

  5. Fix make clean so it doesn't delete the source XML. Add a readme targ… 

    …et, that copies the draft txt to README.md (after wrapping in backticks for formatting)
    @wkumari
    wkumari committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    88e3bba View commit details
    Browse the repository at this point in the history

  6. Merge pull request #7 from wkumari/master 

    Fix make clean so it doesn't delete the source XML. Add a readme target,...
    @martinthomson
    martinthomson committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    921ea69 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2014

  1. Explaining tagging a little better. Closes #8.

    @martinthomson
    martinthomson committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    b853b00 View commit details
    Browse the repository at this point in the history

  2. Removing dead text

    @martinthomson
    martinthomson committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    f94f69c View commit details
    Browse the repository at this point in the history

  3. Moving submission guidance to a new file.

    @martinthomson
    martinthomson committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    fb9f8d0 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2014

  1. Updating travis sync notes

    @martinthomson
    martinthomson committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    366d8d9 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2015

  1. setup-ghpages

    @martinthomson
    martinthomson committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    29322c0 View commit details
    Browse the repository at this point in the history

  2. Update docs

    @martinthomson
    martinthomson committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    7df9c0a View commit details
    Browse the repository at this point in the history

  3. Fixes

    @martinthomson
    martinthomson committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    773410d View commit details
    Browse the repository at this point in the history

  4. Oops

    @martinthomson
    martinthomson committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    b5ccf8f View commit details
    Browse the repository at this point in the history

  5. Fixing travis error

    @martinthomson
    martinthomson committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    a954912 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2015

  1. Recommend virtualenv for pip

    @kuba
    kuba committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    c2dca95 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2015

  1. Merge pull request #9 from kuba/virtualenv 

    Recommend virtualenv for pip
    @martinthomson
    martinthomson committed Mar 22, 2015
    Configuration menu
    Copy the full SHA
    7012924 View commit details
    Browse the repository at this point in the history

  2. Beefing up installation instructions

    @martinthomson
    martinthomson committed Mar 22, 2015
    Configuration menu
    Copy the full SHA
    c68788d View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2015

  1. Adding draft

    @martinthomson
    martinthomson committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    5051bc8 View commit details
    Browse the repository at this point in the history

  2. Updating travis config

    @martinthomson
    martinthomson committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    0e3bc9c View commit details
    Browse the repository at this point in the history

Commits on May 11, 2015

  1. Rework intro

    @martinthomson
    martinthomson committed May 11, 2015
    Configuration menu
    Copy the full SHA
    9a7506c View commit details
    Browse the repository at this point in the history

  2. Rework format description

    @martinthomson
    martinthomson committed May 11, 2015
    Configuration menu
    Copy the full SHA
    2a0cfe3 View commit details
    Browse the repository at this point in the history

  3. Correct error in derivation

    @martinthomson
    martinthomson committed May 11, 2015
    Configuration menu
    Copy the full SHA
    e0c9b10 View commit details
    Browse the repository at this point in the history

  4. Reflow

    @martinthomson
    martinthomson committed May 11, 2015
    Configuration menu
    Copy the full SHA
    15b6ac3 View commit details
    Browse the repository at this point in the history

  5. Fixup of grammar

    @martinthomson
    martinthomson committed May 11, 2015
    Configuration menu
    Copy the full SHA
    6dca13d View commit details
    Browse the repository at this point in the history

  6. Removing some errors

    @martinthomson
    martinthomson committed May 11, 2015
    Configuration menu
    Copy the full SHA
    ca5edbd View commit details
    Browse the repository at this point in the history

  7. Update from upstream

    @martinthomson
    martinthomson committed May 11, 2015
    Configuration menu
    Copy the full SHA
    630e536 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. Using idref db on github

    @martinthomson
    martinthomson committed May 18, 2015
    Configuration menu
    Copy the full SHA
    72df143 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2015

  1. Updating header field definitions

    @martinthomson
    martinthomson committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    7fcddf9 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2015

  1. Properly qualify 'key' on each use

    @martinthomson
    martinthomson committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    eb3226b View commit details
    Browse the repository at this point in the history

  2. Being more precise about what message means

    @martinthomson
    martinthomson committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    5f8fa93 View commit details
    Browse the repository at this point in the history

  3. Some key management, not none

    @martinthomson
    martinthomson committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    84de030 View commit details
    Browse the repository at this point in the history

  4. Editorial fixes

    @martinthomson
    martinthomson committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    0470790 View commit details
    Browse the repository at this point in the history

  5. The last record size is smaller than rs+taglength

    @martinthomson
    martinthomson committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    8522d9b View commit details
    Browse the repository at this point in the history

  6. Padding is right 1-256, not 0-255

    @martinthomson
    martinthomson committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    459b3df View commit details
    Browse the repository at this point in the history

  7. Removing confusion about the use of 'nonce'

    @martinthomson
    martinthomson committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    144353c View commit details
    Browse the repository at this point in the history

  8. CEK -> IKM as a constraint on salt uniqueness

    @martinthomson
    martinthomson committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    4d62804 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2015

  1. At least 16 octets, not exactly

    @martinthomson
    martinthomson committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    5ad153c View commit details
    Browse the repository at this point in the history

  2. Scoping Encryption-Key

    @martinthomson
    martinthomson committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    566734c View commit details
    Browse the repository at this point in the history

  3. Lengths on examples were wrong

    @martinthomson
    martinthomson committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    5b01481 View commit details
    Browse the repository at this point in the history

  4. Reuse implications

    @martinthomson
    martinthomson committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    33eda45 View commit details
    Browse the repository at this point in the history

  5. Starting from a non-zero nonce

    @martinthomson
    martinthomson committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    9e6cc61 View commit details
    Browse the repository at this point in the history

  6. The hyphen must die

    @martinthomson
    martinthomson committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    26da125 View commit details
    Browse the repository at this point in the history

  7. Adding record sizing note; s/byte/octet

    @martinthomson
    martinthomson committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    d91947c View commit details
    Browse the repository at this point in the history

  8. ...when decoded

    @martinthomson
    martinthomson committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    9370368 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2015

  1. Merge pull request #3 from martinthomson/mattsson 

    John Mattsson's review
    @martinthomson
    martinthomson committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    fb051d9 View commit details
    Browse the repository at this point in the history

  2. Moving IANA considerations, fixing capitals

    @martinthomson
    martinthomson committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    6af8817 View commit details
    Browse the repository at this point in the history

  3. Updating JWE text

    @martinthomson
    martinthomson committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    34aa9fe View commit details
    Browse the repository at this point in the history

  4. Updating references

    @martinthomson
    martinthomson committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    88657bb View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2015

  1. Crediting John properly

    @martinthomson
    martinthomson committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    acc21d4 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2015

  1. s/key/aesgcm128/g

    @martinthomson
    martinthomson committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    9bd6a72 View commit details
    Browse the repository at this point in the history

  2. Fixing header definition

    @martinthomson
    martinthomson committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    522d699 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2015

  1. Cleanup

    @martinthomson
    martinthomson committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    76f9312 View commit details
    Browse the repository at this point in the history

  2. Setup repository for draft-thomson-http-encryption

    @martinthomson
    martinthomson committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    ebec934 View commit details
    Browse the repository at this point in the history

  3. Updating acknowledgments

    @martinthomson
    martinthomson committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    12707ab View commit details
    Browse the repository at this point in the history

  4. Updating build setup

    @martinthomson
    martinthomson committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    8f5ccd9 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2015

  1. Adding fix for contributory behaviour; renaming Encryption-Key to Cry… 

    …pto-Key; fixing examples
    @martinthomson
    martinthomson committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    ad786a8 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2015

  1. Updating examples to include new label

    @martinthomson
    martinthomson committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    e54def8 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2015

  1. Adding note about expanded context

    @martinthomson
    martinthomson committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    1b56bc4 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2015

  1. Fixing ABNF declarations

    @martinthomson
    martinthomson committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    7603d68 View commit details
    Browse the repository at this point in the history

  2. Adding authentication secret section

    @martinthomson
    martinthomson committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    69269ee View commit details
    Browse the repository at this point in the history

  3. Expanding the length of the IKM when derived from an authentication s… 

    …ecret
    @martinthomson
    martinthomson committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    da50a1d View commit details
    Browse the repository at this point in the history

  4. Additional corrections/clarifications

    @martinthomson
    martinthomson committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    14721d3 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2015

  1. Canonical encoding to octets of context

    @martinthomson
    martinthomson committed Dec 3, 2015
    Configuration menu
    Copy the full SHA
    a639324 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2015

  1. Merge pull request #5 from martinthomson/auth 

    A more principled approach on authentication
    @martinthomson
    martinthomson committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    646d426 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2015

  1. Update template

    @martinthomson
    martinthomson committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    916d37d View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2015

  1. Disallow duplicated values in the Encryption and Crypto-Key headers

    @beverloo
    beverloo committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    d11c826 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2015

  1. Merge pull request #6 from beverloo/duplicated-values 

    Disallow duplicated values in the Encryption and Crypto-Key headers
    @martinthomson
    martinthomson committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    ebd07a9 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2015

  1. Update SHA-256 ref

    @martinthomson
    martinthomson committed Dec 22, 2015
    Configuration menu
    Copy the full SHA
    f3c04fb View commit details
    Browse the repository at this point in the history

  2. Fixing reference

    @martinthomson
    martinthomson committed Dec 22, 2015
    Configuration menu
    Copy the full SHA
    8201dea View commit details
    Browse the repository at this point in the history

  3. Fixing X9.62 ref

    @martinthomson
    martinthomson committed Dec 22, 2015
    Configuration menu
    Copy the full SHA
    5a872d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2015

  1. Fixing template

    @martinthomson
    martinthomson committed Dec 23, 2015
    Configuration menu
    Copy the full SHA
    9de3ced View commit details
    Browse the repository at this point in the history

  2. Adding encrypted content encoding

    @martinthomson
    martinthomson committed Dec 23, 2015
    1 Configuration menu
    Copy the full SHA
    3a3df89 View commit details
    Browse the repository at this point in the history

  3. Making friendly target right

    @martinthomson
    martinthomson committed Dec 23, 2015
    Configuration menu
    Copy the full SHA
    47d00a6 View commit details
    Browse the repository at this point in the history