- Notifications
You must be signed in to change notification settings - Fork5
Commitc727f12
committed
Rename "scram" to "scram-sha-256" in pg_hba.conf and password_encryption.
Per discussion, plain "scram" is confusing because we actually implementSCRAM-SHA-256 rather than the original SCRAM that uses SHA-1 as the hashalgorithm. If we add support for SCRAM-SHA-512 or some other mechanism inthe SCRAM family in the future, that would become even more confusing.Most of the internal files and functions still use just "scram" as ashorthand for SCRMA-SHA-256, but I did change PASSWORD_TYPE_SCRAM toPASSWORD_TYPE_SCRAM_SHA_256, as that could potentially be used by 3rdparty extensions that hook into the password-check hook.Michael Paquier did this in an earlier version of the SCRAM patch setalready, but I didn't include that in the version that was committed.Discussion:https://www.postgresql.org/message-id/fde71ff1-5858-90c8-99a9-1c2427e7bafb@iki.fi1 parent123aaff commitc727f12
File tree
15 files changed
+60
-59
lines changed- doc/src/sgml
- src
- backend
- commands
- libpq
- utils/misc
- bin/initdb
- include/libpq
- test
- authentication/t
- regress
- expected
- sql
15 files changed
+60
-59
lines changedLines changed: 8 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
412 | 412 |
| |
413 | 413 |
| |
414 | 414 |
| |
415 |
| - | |
| 415 | + | |
416 | 416 |
| |
417 | 417 |
| |
418 | 418 |
| |
| |||
683 | 683 |
| |
684 | 684 |
| |
685 | 685 |
| |
686 |
| - | |
| 686 | + | |
687 | 687 |
| |
688 | 688 |
| |
689 | 689 |
| |
| |||
694 | 694 |
| |
695 | 695 |
| |
696 | 696 |
| |
697 |
| - | |
| 697 | + | |
698 | 698 |
| |
699 | 699 |
| |
700 | 700 |
| |
| |||
922 | 922 |
| |
923 | 923 |
| |
924 | 924 |
| |
925 |
| - | |
| 925 | + | |
926 | 926 |
| |
927 | 927 |
| |
928 | 928 |
| |
| |||
939 | 939 |
| |
940 | 940 |
| |
941 | 941 |
| |
942 |
| - | |
943 |
| - | |
| 942 | + | |
| 943 | + | |
| 944 | + | |
944 | 945 |
| |
945 | 946 |
| |
946 | 947 |
| |
| |||
953 | 954 |
| |
954 | 955 |
| |
955 | 956 |
| |
956 |
| - | |
| 957 | + | |
957 | 958 |
| |
958 | 959 |
| |
959 | 960 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1194 | 1194 |
| |
1195 | 1195 |
| |
1196 | 1196 |
| |
1197 |
| - | |
1198 |
| - | |
| 1197 | + | |
| 1198 | + | |
1199 | 1199 |
| |
1200 | 1200 |
| |
1201 | 1201 |
| |
|
Lines changed: 4 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
140 | 140 |
| |
141 | 141 |
| |
142 | 142 |
| |
143 |
| - | |
144 |
| - | |
| 143 | + | |
| 144 | + | |
145 | 145 |
| |
146 | 146 |
| |
147 | 147 |
| |
| |||
548 | 548 |
| |
549 | 549 |
| |
550 | 550 |
| |
551 |
| - | |
552 |
| - | |
| 551 | + | |
| 552 | + | |
553 | 553 |
| |
554 | 554 |
| |
555 | 555 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
183 | 183 |
| |
184 | 184 |
| |
185 | 185 |
| |
186 |
| - | |
| 186 | + | |
187 | 187 |
| |
188 | 188 |
| |
189 | 189 |
| |
|
Lines changed: 8 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
50 | 50 |
| |
51 | 51 |
| |
52 | 52 |
| |
53 |
| - | |
| 53 | + | |
54 | 54 |
| |
55 | 55 |
| |
56 | 56 |
| |
| |||
757 | 757 |
| |
758 | 758 |
| |
759 | 759 |
| |
760 |
| - | |
761 |
| - | |
762 |
| - | |
763 |
| - | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
764 | 764 |
| |
765 | 765 |
| |
766 | 766 |
| |
| |||
773 | 773 |
| |
774 | 774 |
| |
775 | 775 |
| |
776 |
| - | |
777 |
| - | |
778 |
| - | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
779 | 779 |
| |
780 | 780 |
| |
781 | 781 |
| |
|
Lines changed: 5 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
101 | 101 |
| |
102 | 102 |
| |
103 | 103 |
| |
104 |
| - | |
| 104 | + | |
105 | 105 |
| |
106 | 106 |
| |
107 | 107 |
| |
| |||
141 | 141 |
| |
142 | 142 |
| |
143 | 143 |
| |
144 |
| - | |
| 144 | + | |
145 | 145 |
| |
146 | 146 |
| |
147 | 147 |
| |
| |||
152 | 152 |
| |
153 | 153 |
| |
154 | 154 |
| |
155 |
| - | |
| 155 | + | |
156 | 156 |
| |
157 | 157 |
| |
158 | 158 |
| |
| |||
164 | 164 |
| |
165 | 165 |
| |
166 | 166 |
| |
167 |
| - | |
| 167 | + | |
168 | 168 |
| |
169 | 169 |
| |
170 | 170 |
| |
| |||
280 | 280 |
| |
281 | 281 |
| |
282 | 282 |
| |
283 |
| - | |
| 283 | + | |
284 | 284 |
| |
285 | 285 |
| |
286 | 286 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
126 | 126 |
| |
127 | 127 |
| |
128 | 128 |
| |
129 |
| - | |
| 129 | + | |
130 | 130 |
| |
131 | 131 |
| |
132 | 132 |
| |
| |||
1327 | 1327 |
| |
1328 | 1328 |
| |
1329 | 1329 |
| |
1330 |
| - | |
| 1330 | + | |
1331 | 1331 |
| |
1332 | 1332 |
| |
1333 | 1333 |
| |
|
Lines changed: 4 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
42 | 42 |
| |
43 | 43 |
| |
44 | 44 |
| |
45 |
| - | |
46 |
| - | |
47 |
| - | |
48 |
| - | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
49 | 49 |
| |
50 | 50 |
| |
51 | 51 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
410 | 410 |
| |
411 | 411 |
| |
412 | 412 |
| |
413 |
| - | |
| 413 | + | |
414 | 414 |
| |
415 | 415 |
| |
416 | 416 |
| |
|
Lines changed: 8 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
77 | 77 |
| |
78 | 78 |
| |
79 | 79 |
| |
80 |
| - | |
| 80 | + | |
81 | 81 |
| |
82 | 82 |
| |
83 | 83 |
| |
| |||
99 | 99 |
| |
100 | 100 |
| |
101 | 101 |
| |
102 |
| - | |
| 102 | + | |
103 | 103 |
| |
104 | 104 |
| |
105 | 105 |
| |
| |||
1130 | 1130 |
| |
1131 | 1131 |
| |
1132 | 1132 |
| |
1133 |
| - | |
1134 |
| - | |
| 1133 | + | |
| 1134 | + | |
1135 | 1135 |
| |
1136 | 1136 |
| |
1137 | 1137 |
| |
1138 |
| - | |
| 1138 | + | |
1139 | 1139 |
| |
1140 | 1140 |
| |
1141 | 1141 |
| |
| |||
2329 | 2329 |
| |
2330 | 2330 |
| |
2331 | 2331 |
| |
2332 |
| - | |
| 2332 | + | |
2333 | 2333 |
| |
2334 | 2334 |
| |
2335 |
| - | |
| 2335 | + | |
2336 | 2336 |
| |
2337 | 2337 |
| |
2338 | 2338 |
| |
2339 | 2339 |
| |
2340 | 2340 |
| |
2341 |
| - | |
| 2341 | + | |
2342 | 2342 |
| |
2343 | 2343 |
| |
2344 | 2344 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
25 | 25 |
| |
26 | 26 |
| |
27 | 27 |
| |
28 |
| - | |
| 28 | + | |
29 | 29 |
| |
30 | 30 |
| |
31 | 31 |
| |
|
Lines changed: 7 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
51 | 51 |
| |
52 | 52 |
| |
53 | 53 |
| |
54 |
| - | |
| 54 | + | |
55 | 55 |
| |
56 | 56 |
| |
57 | 57 |
| |
| |||
68 | 68 |
| |
69 | 69 |
| |
70 | 70 |
| |
71 |
| - | |
72 |
| - | |
73 |
| - | |
74 |
| - | |
75 |
| - | |
76 |
| - | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
77 | 77 |
| |
78 | 78 |
| |
79 | 79 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
63 | 63 |
| |
64 | 64 |
| |
65 | 65 |
| |
66 |
| - | |
| 66 | + | |
67 | 67 |
| |
68 | 68 |
| |
69 | 69 |
| |
| |||
73 | 73 |
| |
74 | 74 |
| |
75 | 75 |
| |
76 |
| - | |
| 76 | + | |
77 | 77 |
| |
78 | 78 |
| |
79 | 79 |
| |
|
Lines changed: 4 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
4 | 4 |
| |
5 | 5 |
| |
6 | 6 |
| |
7 |
| - | |
| 7 | + | |
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 | 16 |
| |
17 | 17 |
| |
18 | 18 |
| |
19 |
| - | |
| 19 | + | |
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
| |||
60 | 60 |
| |
61 | 61 |
| |
62 | 62 |
| |
63 |
| - | |
| 63 | + | |
64 | 64 |
| |
65 | 65 |
| |
66 | 66 |
| |
|
Lines changed: 3 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
10 |
| - | |
| 10 | + | |
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
| |||
16 | 16 |
| |
17 | 17 |
| |
18 | 18 |
| |
19 |
| - | |
| 19 | + | |
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
| |||
50 | 50 |
| |
51 | 51 |
| |
52 | 52 |
| |
53 |
| - | |
| 53 | + | |
54 | 54 |
| |
55 | 55 |
| |
56 | 56 |
| |
|
0 commit comments
Comments
(0)