diff options
author | Luke Dashjr <luke_github1@dashjr.org> | 2017-01-01 12:33:50 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-01 12:33:50 +0000 |
commit | 04875c6d6e6c066377b14f056159a65e2db00254 (patch) | |
tree | ffb99ef91289d67ad9bf7fa9cac844cb6c72d889 | |
parent | 657151e00e3e6b232a28c4c6eaa5e84562aed2f4 (diff) | |
parent | 7d94bb685bd14cd8fb119af9c42f26b3eafa359a (diff) |
Merge pull request #482 from techguy613/master
Add license for BIP75
-rw-r--r-- | bip-0075.mediawiki | 11 | ||||
-rwxr-xr-x | scripts/buildtable.pl | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/bip-0075.mediawiki b/bip-0075.mediawiki index 33e2747..2a6fdd5 100644 --- a/bip-0075.mediawiki +++ b/bip-0075.mediawiki @@ -11,6 +11,7 @@ Status: Draft Type: Standards Track Created: 2015-11-20 + License: CC-BY-4.0 </pre> ==Abstract== @@ -24,6 +25,12 @@ This BIP is an extension to BIP 70 that provides two enhancements to the existin The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in RFC 2119. +==Copyright== + +<img src="https://licensebuttons.net/l/by/4.0/88x31.png"> + +This work is licensed under a [[http://creativecommons.org/licenses/by/4.0/|Creative Commons Attribution 4.0 International License]]. + ==Definitions== {| class="wikitable" | Sender || Entity wishing to transfer value that they control @@ -323,13 +330,13 @@ For the following we assume the Sender already knows the Receiver's public key, * If '''pki_type''' is x509+sha256 and '''signature''' is valid for the serialized [[#InvoiceRequest|InvoiceRequest]] where signature is set to "", [[#InvoiceRequest|InvoiceRequest]] is VALID ===Sending Encrypted Payment Protocol Messages using EncryptedProtocolMessages=== -* Encrypt the serialized Payment Protocol message using AES-256-CBC setup as described in [[#ECDH_Point_Generation_and_AES256_GCM_Mode_Setup|ECDH Point Generation and AES-256 (GCM Mode) Setup]] +* Encrypt the serialized Payment Protocol message using AES-256-GCM setup as described in [[#ECDH_Point_Generation_and_AES256_GCM_Mode_Setup|ECDH Point Generation and AES-256 (GCM Mode) Setup]] * Create [[#EncryptedProtocolMessage|EncryptedProtocolMessage]] message * Set '''encrypted_message''' to be the encrypted value of the Payment Protocol message * '''version''' SHOULD be set to the highest version number the client understands (currently 1) * '''sender_public_key''' MUST be set to the public key of the Sender's EC keypair * '''receiver_public_key''' MUST be set to the public key of the Receiver's EC keypair -* '''nonce''' MUST be set to the nonce used in the AES-256-CBC encryption operation +* '''nonce''' MUST be set to the nonce used in the AES-256-GCM encryption operation * Set '''identifier''' to the identifier value received in the originating InvoiceRequest's ProtocolMessage or EncryptedProtocolMessage wrapper message * Set '''signature''' to "" * Sign the serialized [[#EncryptedProtocolMessage|EncryptedProtocolMessage]] message with the communicating party's EC public key diff --git a/scripts/buildtable.pl b/scripts/buildtable.pl index b869ef2..981346b 100755 --- a/scripts/buildtable.pl +++ b/scripts/buildtable.pl @@ -86,7 +86,7 @@ my %DefinedLicenses = ( 'PD' => undef, ); my %GrandfatheredPD = map { $_ => undef } qw(9 36 37 38 42 49 50 60 65 67 69 74 80 81 83 90 99 105 107 109 111 112 113 114 122 124 125 126 130 131 132 133 140 141 142 143 144 146 147 150 151 152); -my %TolerateMissingLicense = map { $_ => undef } qw(1 10 11 12 13 14 15 16 21 30 31 32 33 34 35 39 43 44 45 47 61 62 64 66 68 70 71 72 73 75 101 102 103 106 120 121 123); +my %TolerateMissingLicense = map { $_ => undef } qw(1 10 11 12 13 14 15 16 21 30 31 32 33 34 35 39 43 44 45 47 61 62 64 66 68 70 71 72 73 101 102 103 106 120 121 123); my %emails; |