Skip to content

Commit 04875c6

Browse files
authored
Merge pull request bitcoin#482 from techguy613/master
Add license for BIP75
2 parents 657151e + 7d94bb6 commit 04875c6

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

bip-0075.mediawiki

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
Status: Draft
1212
Type: Standards Track
1313
Created: 2015-11-20
14+
License: CC-BY-4.0
1415
</pre>
1516

1617
==Abstract==
@@ -24,6 +25,12 @@ This BIP is an extension to BIP 70 that provides two enhancements to the existin
2425
The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
2526
"OPTIONAL" in this document are to be interpreted as described in RFC 2119.
2627

28+
==Copyright==
29+
30+
<img src="https://licensebuttons.net/l/by/4.0/88x31.png">
31+
32+
This work is licensed under a [[http://creativecommons.org/licenses/by/4.0/|Creative Commons Attribution 4.0 International License]].
33+
2734
==Definitions==
2835
{| class="wikitable"
2936
| 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,
323330
* If '''pki_type''' is x509+sha256 and '''signature''' is valid for the serialized [[#InvoiceRequest|InvoiceRequest]] where signature is set to "", [[#InvoiceRequest|InvoiceRequest]] is VALID
324331
325332
===Sending Encrypted Payment Protocol Messages using EncryptedProtocolMessages===
326-
* 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]]
333+
* 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]]
327334
* Create [[#EncryptedProtocolMessage|EncryptedProtocolMessage]] message
328335
* Set '''encrypted_message''' to be the encrypted value of the Payment Protocol message
329336
* '''version''' SHOULD be set to the highest version number the client understands (currently 1)
330337
* '''sender_public_key''' MUST be set to the public key of the Sender's EC keypair
331338
* '''receiver_public_key''' MUST be set to the public key of the Receiver's EC keypair
332-
* '''nonce''' MUST be set to the nonce used in the AES-256-CBC encryption operation
339+
* '''nonce''' MUST be set to the nonce used in the AES-256-GCM encryption operation
333340
* Set '''identifier''' to the identifier value received in the originating InvoiceRequest's ProtocolMessage or EncryptedProtocolMessage wrapper message
334341
* Set '''signature''' to ""
335342
* Sign the serialized [[#EncryptedProtocolMessage|EncryptedProtocolMessage]] message with the communicating party's EC public key

scripts/buildtable.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
'PD' => undef,
8787
);
8888
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);
89-
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);
89+
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);
9090

9191
my %emails;
9292

0 commit comments

Comments
 (0)