forked from curl/curl
-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy pathtongsuo.patch
1340 lines (1311 loc) · 41.2 KB
/
tongsuo.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/docs/libcurl/curl_easy_setopt.md b/docs/libcurl/curl_easy_setopt.md
index e0fe95cac..cc88339fd 100644
--- a/docs/libcurl/curl_easy_setopt.md
+++ b/docs/libcurl/curl_easy_setopt.md
@@ -1068,6 +1068,14 @@ Client cert type. See CURLOPT_SSLCERTTYPE(3)
Client cert memory buffer. See CURLOPT_SSLCERT_BLOB(3)
+## CURLOPT_SSLENCCERT
+
+Encryption certificate. See CURLOPT_SSLENCCERT(3)
+
+## CURLOPT_SSLENCKEY
+
+Encryption key. See CURLOPT_SSLENCKEY(3)
+
## CURLOPT_SSLENGINE
Use identifier with SSL engine. See CURLOPT_SSLENGINE(3)
@@ -1088,6 +1096,14 @@ Client key type. See CURLOPT_SSLKEYTYPE(3)
Client key memory buffer. See CURLOPT_SSLKEY_BLOB(3)
+## CURLOPT_SSLSIGNCERT
+
+Signature certificate. See CURLOPT_SSLSIGNCERT(3)
+
+## CURLOPT_SSLSIGNKEY
+
+Signature key. See CURLOPT_SSLSIGNKEY(3)
+
## CURLOPT_SSLVERSION
SSL version to use. See CURLOPT_SSLVERSION(3)
diff --git a/docs/libcurl/opts/CURLOPT_SSLENCCERT.md b/docs/libcurl/opts/CURLOPT_SSLENCCERT.md
new file mode 100644
index 000000000..bc833bee3
--- /dev/null
+++ b/docs/libcurl/opts/CURLOPT_SSLENCCERT.md
@@ -0,0 +1,96 @@
+---
+c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+SPDX-License-Identifier: curl
+Title: CURLOPT_SSLENCCERT
+Section: 3
+Source: libcurl
+See-also:
+ - CURLOPT_SSLCERTTYPE (3)
+ - CURLOPT_SSLENCKEY (3)
+ - CURLOPT_SSLSIGNCERT (3)
+ - CURLOPT_SSLSIGNKEY (3)
+ - CURLOPT_KEYPASSWD (3)
+Protocol:
+ - NTLS
+TLS-backend:
+ - Tongsuo
+Added-in: 7.80.0
+---
+
+# NAME
+
+CURLOPT_SSLENCCERT - SSL client encryption certificate
+
+# SYNOPSIS
+
+~~~c
+#include <curl/curl.h>
+
+CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLENCCERT, char *cert);
+~~~
+
+# DESCRIPTION
+
+Pass a pointer to a null-terminated string as parameter. The string should be
+the filename of your client encryption certificate. The default format is `P12`
+on Secure Transport and `PEM` on other engines, and can be changed with
+CURLOPT_SSLCERTTYPE(3).
+
+With Secure Transport, this can also be the nickname of the certificate you
+wish to authenticate with as it is named in the security database. If you want
+to use a file from the current directory, please precede it with `./` prefix,
+in order to avoid confusion with a nickname.
+
+(Schannel only) Client certificates can be specified by a path expression to a
+certificate store. (You can import *PFX* to a store first). You can use
+"\<store location\>\\\<store name\>\\\<thumbprint\>" to refer to a certificate
+in the system certificates store, for example,
+**"CurrentUser\\MY\\934a7ac6f8a5d5"**. The thumbprint is usually a SHA-1 hex
+string which you can see in certificate details. Following store locations are
+supported: **CurrentUser**, **LocalMachine**, **CurrentService**,
+**Services**, **CurrentUserGroupPolicy**, **LocalMachineGroupPolicy**,
+**LocalMachineEnterprise**. Schannel also support P12 certificate file, with
+the string `P12` specified with CURLOPT_SSLCERTTYPE(3).
+
+When using a client encryption certificate, you most likely also need to provide
+a private key with CURLOPT_SSLENCKEY(3).
+
+The application does not have to keep the string around after setting this
+option.
+
+Using this option multiple times makes the last set string override the
+previous ones. Set it to NULL to disable its use again.
+
+# DEFAULT
+
+NULL
+
+# %PROTOCOLS%
+
+# EXAMPLE
+
+~~~c
+int main(void)
+{
+ CURL *curl = curl_easy_init();
+ if(curl) {
+ CURLcode res;
+ curl_easy_setopt(curl, CURLOPT_URL, "https://example.com/");
+ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_NTLSv1_1);
+ curl_easy_setopt(curl, CURLOPT_SSLENCCERT, "enc.crt");
+ curl_easy_setopt(curl, CURLOPT_SSLENCKEY, "enc.key");
+ curl_easy_setopt(curl, CURLOPT_SSLSIGNCERT, "sign.crt");
+ curl_easy_setopt(curl, CURLOPT_SSLSIGNKEY, "sign.key");
+ curl_easy_setopt(curl, CURLOPT_KEYPASSWD, "s3cret");
+ res = curl_easy_perform(curl);
+ curl_easy_cleanup(curl);
+ }
+}
+~~~
+
+# %AVAILABILITY%
+
+# RETURN VALUE
+
+Returns CURLE_OK if NTLS enabled, CURLE_UNKNOWN_OPTION if not, or
+CURLE_OUT_OF_MEMORY if there was insufficient heap space.
diff --git a/docs/libcurl/opts/CURLOPT_SSLENCKEY.md b/docs/libcurl/opts/CURLOPT_SSLENCKEY.md
new file mode 100644
index 000000000..16a923230
--- /dev/null
+++ b/docs/libcurl/opts/CURLOPT_SSLENCKEY.md
@@ -0,0 +1,78 @@
+---
+c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+SPDX-License-Identifier: curl
+Title: CURLOPT_SSLENCKEY
+Section: 3
+Source: libcurl
+See-also:
+ - CURLOPT_SSLENCCERT (3)
+ - CURLOPT_SSLSIGNCERT (3)
+ - CURLOPT_SSLSIGNKEY (3)
+ - CURLOPT_SSLKEYTYPE (3)
+Protocol:
+ - NTLS
+TLS-backend:
+ - Tongsuo
+Added-in: 7.80.0
+---
+
+# NAME
+
+CURLOPT_SSLENCKEY - private key file for NTLS and SSL client encryption cert
+
+# SYNOPSIS
+
+~~~c
+#include <curl/curl.h>
+
+CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLENCKEY, char *keyfile);
+~~~
+
+# DESCRIPTION
+
+Pass a pointer to a null-terminated string as parameter. The string should be
+the filename of your private key. The default format is "PEM" and can be
+changed with CURLOPT_SSLKEYTYPE(3).
+
+(Windows, iOS and macOS) This option is ignored by Secure Transport because
+they expect the private key to be already present in the key-chain or PKCS#12
+file containing the certificate.
+
+The application does not have to keep the string around after setting this
+option.
+
+Using this option multiple times makes the last set string override the
+previous ones. Set it to NULL to disable its use again.
+
+# DEFAULT
+
+NULL
+
+# %PROTOCOLS%
+
+# EXAMPLE
+
+~~~c
+int main(void)
+{
+ CURL *curl = curl_easy_init();
+ if(curl) {
+ CURLcode res;
+ curl_easy_setopt(curl, CURLOPT_URL, "https://example.com/");
+ curl_easy_setopt(curl, CURLOPT_SSLENCCERT, "enc.crt");
+ curl_easy_setopt(curl, CURLOPT_SSLENCKEY, "enc.key");
+ curl_easy_setopt(curl, CURLOPT_SSLSIGNCERT, "sign.crt");
+ curl_easy_setopt(curl, CURLOPT_SSLSIGNKEY, "sign.key");
+ curl_easy_setopt(curl, CURLOPT_KEYPASSWD, "s3cret");
+ res = curl_easy_perform(curl);
+ curl_easy_cleanup(curl);
+ }
+}
+~~~
+
+# %AVAILABILITY%
+
+# RETURN VALUE
+
+Returns CURLE_OK if NTLS is supported, CURLE_UNKNOWN_OPTION if not, or
+CURLE_OUT_OF_MEMORY if there was insufficient heap space.
diff --git a/docs/libcurl/opts/CURLOPT_SSLSIGNCERT.md b/docs/libcurl/opts/CURLOPT_SSLSIGNCERT.md
new file mode 100644
index 000000000..eca84f1c6
--- /dev/null
+++ b/docs/libcurl/opts/CURLOPT_SSLSIGNCERT.md
@@ -0,0 +1,96 @@
+---
+c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+SPDX-License-Identifier: curl
+Title: CURLOPT_SSLSIGNCERT
+Section: 3
+Source: libcurl
+See-also:
+ - CURLOPT_SSLCERTTYPE (3)
+ - CURLOPT_SSLENCKEY (3)
+ - CURLOPT_SSLENCCERT (3)
+ - CURLOPT_SSLSIGNKEY (3)
+ - CURLOPT_KEYPASSWD (3)
+Protocol:
+ - NTLS
+TLS-backend:
+ - Tongsuo
+Added-in: 7.80.0
+---
+
+# NAME
+
+CURLOPT_SSLSIGNCERT - SSL client signature certificate
+
+# SYNOPSIS
+
+~~~c
+#include <curl/curl.h>
+
+CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLSIGNCERT, char *cert);
+~~~
+
+# DESCRIPTION
+
+Pass a pointer to a null-terminated string as parameter. The string should be
+the filename of your client signature certificate. The default format is `P12`
+on Secure Transport and `PEM` on other engines, and can be changed with
+CURLOPT_SSLCERTTYPE(3).
+
+With Secure Transport, this can also be the nickname of the certificate you
+wish to authenticate with as it is named in the security database. If you want
+to use a file from the current directory, please precede it with `./` prefix,
+in order to avoid confusion with a nickname.
+
+(Schannel only) Client certificates can be specified by a path expression to a
+certificate store. (You can import *PFX* to a store first). You can use
+"\<store location\>\\\<store name\>\\\<thumbprint\>" to refer to a certificate
+in the system certificates store, for example,
+**"CurrentUser\\MY\\934a7ac6f8a5d5"**. The thumbprint is usually a SHA-1 hex
+string which you can see in certificate details. Following store locations are
+supported: **CurrentUser**, **LocalMachine**, **CurrentService**,
+**Services**, **CurrentUserGroupPolicy**, **LocalMachineGroupPolicy**,
+**LocalMachineEnterprise**. Schannel also support P12 certificate file, with
+the string `P12` specified with CURLOPT_SSLCERTTYPE(3).
+
+When using a client signature certificate, you most likely also need to provide
+a private key with CURLOPT_SSLSIGNKEY(3).
+
+The application does not have to keep the string around after setting this
+option.
+
+Using this option multiple times makes the last set string override the
+previous ones. Set it to NULL to disable its use again.
+
+# DEFAULT
+
+NULL
+
+# %PROTOCOLS%
+
+# EXAMPLE
+
+~~~c
+int main(void)
+{
+ CURL *curl = curl_easy_init();
+ if(curl) {
+ CURLcode res;
+ curl_easy_setopt(curl, CURLOPT_URL, "https://example.com/");
+ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_NTLSv1_1);
+ curl_easy_setopt(curl, CURLOPT_SSLENCCERT, "enc.crt");
+ curl_easy_setopt(curl, CURLOPT_SSLENCKEY, "enc.key");
+ curl_easy_setopt(curl, CURLOPT_SSLSIGNCERT, "sign.crt");
+ curl_easy_setopt(curl, CURLOPT_SSLSIGNKEY, "sign.key");
+ curl_easy_setopt(curl, CURLOPT_KEYPASSWD, "s3cret");
+ res = curl_easy_perform(curl);
+ curl_easy_cleanup(curl);
+ }
+}
+~~~
+
+# %AVAILABILITY%
+
+# RETURN VALUE
+
+Returns CURLE_OK if NTLS enabled, CURLE_UNKNOWN_OPTION if not, or
+CURLE_OUT_OF_MEMORY if there was insufficient heap space.
diff --git a/docs/libcurl/opts/CURLOPT_SSLSIGNKEY.md b/docs/libcurl/opts/CURLOPT_SSLSIGNKEY.md
new file mode 100644
index 000000000..81b7a9d00
--- /dev/null
+++ b/docs/libcurl/opts/CURLOPT_SSLSIGNKEY.md
@@ -0,0 +1,78 @@
+---
+c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+SPDX-License-Identifier: curl
+Title: CURLOPT_SSLSIGNKEY
+Section: 3
+Source: libcurl
+See-also:
+ - CURLOPT_SSLSIGNCERT (3)
+ - CURLOPT_SSLENCCERT (3)
+ - CURLOPT_SSLENCKEY (3)
+ - CURLOPT_SSLKEYTYPE (3)
+Protocol:
+ - NTLS
+TLS-backend:
+ - Tongsuo
+Added-in: 7.80.0
+---
+
+# NAME
+
+CURLOPT_SSLSIGNKEY - private key file for NTLS and SSL client signature cert
+
+# SYNOPSIS
+
+~~~c
+#include <curl/curl.h>
+
+CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLSIGNKEY, char *keyfile);
+~~~
+
+# DESCRIPTION
+
+Pass a pointer to a null-terminated string as parameter. The string should be
+the filename of your private key. The default format is "PEM" and can be
+changed with CURLOPT_SSLKEYTYPE(3).
+
+(Windows, iOS and macOS) This option is ignored by Secure Transport because
+they expect the private key to be already present in the key-chain or PKCS#12
+file containing the certificate.
+
+The application does not have to keep the string around after setting this
+option.
+
+Using this option multiple times makes the last set string override the
+previous ones. Set it to NULL to disable its use again.
+
+# DEFAULT
+
+NULL
+
+# %PROTOCOLS%
+
+# EXAMPLE
+
+~~~c
+int main(void)
+{
+ CURL *curl = curl_easy_init();
+ if(curl) {
+ CURLcode res;
+ curl_easy_setopt(curl, CURLOPT_URL, "https://example.com/");
+ curl_easy_setopt(curl, CURLOPT_SSLENCCERT, "enc.crt");
+ curl_easy_setopt(curl, CURLOPT_SSLENCKEY, "enc.key");
+ curl_easy_setopt(curl, CURLOPT_SSLSIGNCERT, "sign.crt");
+ curl_easy_setopt(curl, CURLOPT_SSLSIGNKEY, "sign.key");
+ curl_easy_setopt(curl, CURLOPT_KEYPASSWD, "s3cret");
+ res = curl_easy_perform(curl);
+ curl_easy_cleanup(curl);
+ }
+}
+~~~
+
+# %AVAILABILITY%
+
+# RETURN VALUE
+
+Returns CURLE_OK if NTLS is supported, CURLE_UNKNOWN_OPTION if not, or
+CURLE_OUT_OF_MEMORY if there was insufficient heap space.
diff --git a/docs/libcurl/opts/Makefile.inc b/docs/libcurl/opts/Makefile.inc
index 9d8606dd0..890d4328a 100644
--- a/docs/libcurl/opts/Makefile.inc
+++ b/docs/libcurl/opts/Makefile.inc
@@ -428,4 +428,8 @@ man_MANS = \
CURLSHOPT_SHARE.3 \
CURLSHOPT_UNLOCKFUNC.3 \
CURLSHOPT_UNSHARE.3 \
- CURLSHOPT_USERDATA.3
+ CURLSHOPT_USERDATA.3 \
+ CURLOPT_SSLENCCERT.3 \
+ CURLOPT_SSLENCKEY.3 \
+ CURLOPT_SSLSIGNCERT.3 \
+ CURLOPT_SSLSIGNKEY.3
diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions
index 0fd02ff09..643025d44 100644
--- a/docs/libcurl/symbols-in-versions
+++ b/docs/libcurl/symbols-in-versions
@@ -12,6 +12,12 @@
Name Introduced Deprecated Last
+CURLOPT_SSLENCCERT 7.80.0
+CURLOPT_SSLENCKEY 7.80.0
+CURLOPT_SSLSIGNCERT 7.80.0
+CURLOPT_SSLSIGNKEY 7.80.0
+CURL_SSLVERSION_NTLSv1_1 7.80.0
+CURL_SSLVERSION_MAX_NTLSv1_1 7.80.0
CURL_AT_LEAST_VERSION 7.43.0
CURL_BLOB_COPY 7.71.0
CURL_BLOB_NOCOPY 7.71.0
diff --git a/include/curl/curl.h b/include/curl/curl.h
index fae168966..0788bab69 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -2228,6 +2228,18 @@ typedef enum {
/* maximum number of keepalive probes (Linux, *BSD, macOS, etc.) */
CURLOPT(CURLOPT_TCP_KEEPCNT, CURLOPTTYPE_LONG, 326),
+ /* name of the file keeping your SSL sign certificate */
+ CURLOPT(CURLOPT_SSLSIGNCERT, CURLOPTTYPE_STRINGPOINT, 327),
+
+ /* name of the file keeping your SSL sign key */
+ CURLOPT(CURLOPT_SSLSIGNKEY, CURLOPTTYPE_STRINGPOINT, 328),
+
+ /* name of the file keeping your SSL enc certificate */
+ CURLOPT(CURLOPT_SSLENCCERT, CURLOPTTYPE_STRINGPOINT, 329),
+
+ /* name of the file keeping your SSL enc key */
+ CURLOPT(CURLOPT_SSLENCKEY, CURLOPTTYPE_STRINGPOINT, 330),
+
CURLOPT_LASTENTRY /* the last unused */
} CURLoption;
@@ -2341,8 +2353,9 @@ enum CURL_NETRC_OPTION {
#define CURL_SSLVERSION_TLSv1_1 5
#define CURL_SSLVERSION_TLSv1_2 6
#define CURL_SSLVERSION_TLSv1_3 7
+#define CURL_SSLVERSION_NTLSv1_1 8
-#define CURL_SSLVERSION_LAST 8 /* never use, keep last */
+#define CURL_SSLVERSION_LAST 9 /* never use, keep last */
#define CURL_SSLVERSION_MAX_NONE 0
#define CURL_SSLVERSION_MAX_DEFAULT (CURL_SSLVERSION_TLSv1 << 16)
@@ -2350,7 +2363,7 @@ enum CURL_NETRC_OPTION {
#define CURL_SSLVERSION_MAX_TLSv1_1 (CURL_SSLVERSION_TLSv1_1 << 16)
#define CURL_SSLVERSION_MAX_TLSv1_2 (CURL_SSLVERSION_TLSv1_2 << 16)
#define CURL_SSLVERSION_MAX_TLSv1_3 (CURL_SSLVERSION_TLSv1_3 << 16)
-
+#define CURL_SSLVERSION_MAX_NTLSv1_1 (CURL_SSLVERSION_NTLSv1_1 << 16)
/* never use, keep last */
#define CURL_SSLVERSION_MAX_LAST (CURL_SSLVERSION_LAST << 16)
diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h
index e532e6997..e1d1555c4 100644
--- a/include/curl/typecheck-gcc.h
+++ b/include/curl/typecheck-gcc.h
@@ -349,6 +349,10 @@ CURLWARNING(_curl_easy_getinfo_err_curl_off_t,
(option) == CURLOPT_USERPWD || \
(option) == CURLOPT_XOAUTH2_BEARER || \
(option) == CURLOPT_SSL_EC_CURVES || \
+ (option) == CURLOPT_SSLSIGNCERT || \
+ (option) == CURLOPT_SSLSIGNKEY || \
+ (option) == CURLOPT_SSLENCCERT || \
+ (option) == CURLOPT_SSLENCKEY || \
0)
/* evaluates to true if option takes a curl_write_callback argument */
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 1f280a96c..167ccfb5b 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -497,4 +497,8 @@ Vista
/* If you want to build curl with the built-in manual */
#define USE_MANUAL 1
+#ifdef USE_NTLS
+# define HAVE_NTLS 1
+#endif
+
#endif /* HEADER_CURL_CONFIG_WIN32_H */
diff --git a/lib/easyoptions.c b/lib/easyoptions.c
index 81091c405..ab864f7de 100644
--- a/lib/easyoptions.c
+++ b/lib/easyoptions.c
@@ -301,12 +301,16 @@ struct curl_easyoption Curl_easyopts[] = {
{"SSLCERTPASSWD", CURLOPT_KEYPASSWD, CURLOT_STRING, CURLOT_FLAG_ALIAS},
{"SSLCERTTYPE", CURLOPT_SSLCERTTYPE, CURLOT_STRING, 0},
{"SSLCERT_BLOB", CURLOPT_SSLCERT_BLOB, CURLOT_BLOB, 0},
+ {"SSLENCCERT", CURLOPT_SSLENCCERT, CURLOT_STRING, 0},
+ {"SSLENCKEY", CURLOPT_SSLENCKEY, CURLOT_STRING, 0},
{"SSLENGINE", CURLOPT_SSLENGINE, CURLOT_STRING, 0},
{"SSLENGINE_DEFAULT", CURLOPT_SSLENGINE_DEFAULT, CURLOT_LONG, 0},
{"SSLKEY", CURLOPT_SSLKEY, CURLOT_STRING, 0},
{"SSLKEYPASSWD", CURLOPT_KEYPASSWD, CURLOT_STRING, CURLOT_FLAG_ALIAS},
{"SSLKEYTYPE", CURLOPT_SSLKEYTYPE, CURLOT_STRING, 0},
{"SSLKEY_BLOB", CURLOPT_SSLKEY_BLOB, CURLOT_BLOB, 0},
+ {"SSLSIGNCERT", CURLOPT_SSLSIGNCERT, CURLOT_STRING, 0},
+ {"SSLSIGNKEY", CURLOPT_SSLSIGNKEY, CURLOT_STRING, 0},
{"SSLVERSION", CURLOPT_SSLVERSION, CURLOT_VALUES, 0},
{"SSL_CIPHER_LIST", CURLOPT_SSL_CIPHER_LIST, CURLOT_STRING, 0},
{"SSL_CTX_DATA", CURLOPT_SSL_CTX_DATA, CURLOT_CBPTR, 0},
@@ -377,6 +381,6 @@ struct curl_easyoption Curl_easyopts[] = {
*/
int Curl_easyopts_check(void)
{
- return ((CURLOPT_LASTENTRY%10000) != (326 + 1));
+ return ((CURLOPT_LASTENTRY%10000) != (330 + 1));
}
#endif
diff --git a/lib/setopt.c b/lib/setopt.c
index 7366d4a3e..d3fa1aa52 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -1663,6 +1663,16 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option,
{
CURLcode result = CURLE_OK;
switch(option) {
+#ifdef HAVE_NTLS
+ case CURLOPT_SSLSIGNCERT:
+ return Curl_setstropt(&data->set.str[STRING_SIGN_CERT], ptr);
+ case CURLOPT_SSLSIGNKEY:
+ return Curl_setstropt(&data->set.str[STRING_SIGN_KEY], ptr);
+ case CURLOPT_SSLENCCERT:
+ return Curl_setstropt(&data->set.str[STRING_ENC_CERT], ptr);
+ case CURLOPT_SSLENCKEY:
+ return Curl_setstropt(&data->set.str[STRING_ENC_KEY], ptr);
+#endif
case CURLOPT_SSL_CIPHER_LIST:
if(Curl_ssl_supports(data, SSLSUPP_CIPHER_LIST))
/* set a list of cipher we want to use in the SSL connection */
diff --git a/lib/urldata.h b/lib/urldata.h
index fc09efad6..6966495d8 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -301,6 +301,12 @@ struct ssl_config_data {
struct curl_blob *key_blob;
char *key_type; /* format for private key (default: PEM) */
char *key_passwd; /* plain text private key password */
+#ifdef HAVE_NTLS
+ char *sign_cert;
+ char *sign_key;
+ char *enc_cert;
+ char *enc_key;
+#endif
BIT(certinfo); /* gather lots of certificate info */
BIT(falsestart);
BIT(earlydata); /* use tls1.3 early data */
@@ -1484,6 +1490,12 @@ enum dupstring {
#endif
#ifndef CURL_DISABLE_PROXY
STRING_HAPROXY_CLIENT_IP, /* CURLOPT_HAPROXY_CLIENT_IP */
+#endif
+#ifdef HAVE_NTLS
+ STRING_SIGN_CERT,
+ STRING_SIGN_KEY,
+ STRING_ENC_CERT,
+ STRING_ENC_KEY,
#endif
STRING_ECH_CONFIG, /* CURLOPT_ECH_CONFIG */
STRING_ECH_PUBLIC, /* CURLOPT_ECH_PUBLIC */
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index f253674b2..d9b0e6386 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -3498,6 +3498,11 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
case TRNSPRT_TCP:
/* check to see if we have been told to use an explicit SSL/TLS version */
switch(ssl_version_min) {
+#ifdef HAVE_NTLS
+ case CURL_SSLVERSION_NTLSv1_1:
+ req_method = NTLS_client_method();
+ break;
+#endif
case CURL_SSLVERSION_DEFAULT:
case CURL_SSLVERSION_TLSv1:
case CURL_SSLVERSION_TLSv1_0:
@@ -3628,7 +3633,11 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
case CURL_SSLVERSION_SSLv2:
case CURL_SSLVERSION_SSLv3:
return CURLE_NOT_BUILT_IN;
-
+#ifdef HAVE_NTLS
+ case CURL_SSLVERSION_NTLSv1_1:
+ SSL_CTX_enable_ntls(octx->ssl_ctx);
+ break;
+#endif
/* "--tlsv<x.y>" options mean TLS >= version <x.y> */
case CURL_SSLVERSION_DEFAULT:
case CURL_SSLVERSION_TLSv1: /* TLS >= version 1.0 */
@@ -3683,6 +3692,51 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
return result;
}
+#ifdef HAVE_NTLS
+ if(ssl_version_min == CURL_SSLVERSION_NTLSv1_1) {
+ char *sign_cert = ssl_config->sign_cert;
+ char *sign_key = ssl_config->sign_key;
+ char *enc_cert = ssl_config->enc_cert;
+ char *enc_key = ssl_config->enc_key;
+
+ if(sign_cert
+ && !SSL_CTX_use_sign_certificate_file(octx->ssl_ctx, sign_cert,
+ SSL_FILETYPE_PEM)) {
+ failf(data, "SSL: failed settting sign certificate file: %s",
+ ossl_strerror(ERR_get_error(), error_buffer,
+ sizeof(error_buffer)));
+ return CURLE_SSL_CERTPROBLEM;
+ }
+
+ if(sign_key
+ && !SSL_CTX_use_sign_PrivateKey_file(octx->ssl_ctx, sign_key,
+ SSL_FILETYPE_PEM)) {
+ failf(data, "SSL: failed settting sign key file: %s",
+ ossl_strerror(ERR_get_error(), error_buffer,
+ sizeof(error_buffer)));
+ return CURLE_SSL_CERTPROBLEM;
+ }
+
+ if(enc_cert
+ && !SSL_CTX_use_enc_certificate_file(octx->ssl_ctx, enc_cert,
+ SSL_FILETYPE_PEM)) {
+ failf(data, "SSL: failed settting enc certificate file: %s",
+ ossl_strerror(ERR_get_error(), error_buffer,
+ sizeof(error_buffer)));
+ return CURLE_SSL_CERTPROBLEM;
+ }
+
+ if(enc_key
+ && !SSL_CTX_use_enc_PrivateKey_file(octx->ssl_ctx, enc_key,
+ SSL_FILETYPE_PEM)) {
+ failf(data, "SSL: failed settting enc key file: %s",
+ ossl_strerror(ERR_get_error(), error_buffer,
+ sizeof(error_buffer)));
+ return CURLE_SSL_CERTPROBLEM;
+ }
+ }
+#endif
+
ciphers = conn_config->cipher_list;
if(!ciphers && (peer->transport != TRNSPRT_QUIC))
ciphers = DEFAULT_CIPHER_SELECTION;
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 02085f412..effdeeb6a 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -313,6 +313,13 @@ CURLcode Curl_ssl_easy_config_complete(struct Curl_easy *data)
data->set.ssl.primary.clientcert = data->set.str[STRING_CERT];
data->set.ssl.key_blob = data->set.blobs[BLOB_KEY];
+#ifdef HAVE_NTLS
+ data->set.ssl.sign_cert = data->set.str[STRING_SIGN_CERT];
+ data->set.ssl.sign_key = data->set.str[STRING_SIGN_KEY];
+ data->set.ssl.enc_cert = data->set.str[STRING_ENC_CERT];
+ data->set.ssl.enc_key = data->set.str[STRING_ENC_KEY];
+#endif
+
#ifndef CURL_DISABLE_PROXY
data->set.proxy_ssl.primary.CApath = data->set.str[STRING_SSL_CAPATH_PROXY];
data->set.proxy_ssl.primary.CAfile = data->set.str[STRING_SSL_CAFILE_PROXY];
diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4
index de20a64f7..f4868f1bf 100644
--- a/m4/curl-openssl.m4
+++ b/m4/curl-openssl.m4
@@ -401,4 +401,24 @@ if test "$OPENSSL_ENABLED" = "1"; then
AC_MSG_RESULT([no])
])
fi
+
+dnl ---
+dnl Check for NTLS provided by Tongsuo
+dnl ---
+if test "$OPENSSL_ENABLED" = "1"; then
+ AC_MSG_CHECKING([for NTLS support in Tongsuo])
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <openssl/ssl.h>
+ ]],[[
+ const SSL_METHOD *meth = NTLS_method();
+ ]])
+ ],[
+ AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_NTLS, 1, [if you have the functions NTLS_method])
+ AC_SUBST(HAVE_NTLS, [1])
+ ],[
+ AC_MSG_RESULT([no])
+ ])
+fi
])
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 48f7f6d4a..ee1855def 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1157,9 +1157,13 @@ curl_easy_setopt_ccsid(CURL *easy, CURLoption tag, ...)
case CURLOPT_SSH_PUBLIC_KEYFILE:
case CURLOPT_SSLCERT:
case CURLOPT_SSLCERTTYPE:
+ case CURLOPT_SSLENCCERT:
+ case CURLOPT_SSLENCKEY:
case CURLOPT_SSLENGINE:
case CURLOPT_SSLKEY:
case CURLOPT_SSLKEYTYPE:
+ case CURLOPT_SSLSIGNCERT:
+ case CURLOPT_SSLSIGNKEY:
case CURLOPT_SSL_CIPHER_LIST:
case CURLOPT_SSL_EC_CURVES:
case CURLOPT_TLS13_CIPHERS:
diff --git a/scripts/cd2nroff b/scripts/cd2nroff
index 86cae2137..9c16dbee8 100755
--- a/scripts/cd2nroff
+++ b/scripts/cd2nroff
@@ -182,7 +182,8 @@ my %knownprotos = (
'TLS' => 1,
'TCP' => 1,
'QUIC' => 1,
- 'All' => 1
+ 'All' => 1,
+ 'NTLS' => 1,
);
my %knowntls = (
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index d7ee7b1b2..1165d0aa8 100644
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -181,6 +181,12 @@ static void free_config_fields(struct OperationConfig *config)
Curl_safefree(config->ech);
Curl_safefree(config->ech_config);
Curl_safefree(config->ech_public);
+#ifdef HAVE_NTLS
+ Curl_safefree(config->sign_cert);
+ Curl_safefree(config->sign_key);
+ Curl_safefree(config->enc_cert);
+ Curl_safefree(config->enc_key);
+#endif
}
void config_free(struct OperationConfig *config)
diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index 62f0e58cc..83a4043f7 100644
--- a/src/tool_cfgable.h
+++ b/src/tool_cfgable.h
@@ -310,6 +310,12 @@ struct OperationConfig {
char *ech; /* Config set by --ech keywords */
char *ech_config; /* Config set by "--ech esl:" option */
char *ech_public; /* Config set by "--ech pn:" option */
+#ifdef HAVE_NTLS
+ char *sign_cert;
+ char *sign_key;
+ char *enc_cert;
+ char *enc_key;
+#endif
};
struct GlobalConfig {
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 81dbbb883..eac91ddb6 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -118,6 +118,10 @@ static const struct LongShort aliases[]= {
{"dump-header", ARG_FILE, 'D', C_DUMP_HEADER},
{"ech", ARG_STRG, ' ', C_ECH},
{"egd-file", ARG_STRG, ' ', C_EGD_FILE},
+#ifdef HAVE_NTLS
+ {"enc-cert", ARG_FILE, ' ', C_ENC_CERT},
+ {"enc-key", ARG_FILE, ' ', C_ENC_KEY},
+#endif
{"engine", ARG_STRG, ' ', C_ENGINE},
{"eprt", ARG_BOOL, ' ', C_EPRT},
{"epsv", ARG_BOOL, ' ', C_EPSV},
@@ -282,6 +286,10 @@ static const struct LongShort aliases[]= {
{"sessionid", ARG_BOOL|ARG_NO, ' ', C_SESSIONID},
{"show-error", ARG_BOOL, 'S', C_SHOW_ERROR},
{"show-headers", ARG_BOOL, 'i', C_SHOW_HEADERS},
+#ifdef HAVE_NTLS
+ {"sign-cert", ARG_FILE, ' ', C_SIGN_CERT},
+ {"sign-key", ARG_FILE, ' ', C_SIGN_KEY},
+#endif
{"silent", ARG_BOOL, 's', C_SILENT},
{"skip-existing", ARG_BOOL, ' ', C_SKIP_EXISTING},
{"socks4", ARG_STRG, ' ', C_SOCKS4},
@@ -315,6 +323,9 @@ static const struct LongShort aliases[]= {
{"tftp-blksize", ARG_STRG, ' ', C_TFTP_BLKSIZE},
{"tftp-no-options", ARG_BOOL, ' ', C_TFTP_NO_OPTIONS},
{"time-cond", ARG_STRG, 'z', C_TIME_COND},
+#ifdef HAVE_NTLS
+ {"tlcp", ARG_BOOL, ' ', C_TLCP},
+#endif
{"tls-earlydata", ARG_BOOL, ' ', C_TLS_EARLYDATA},
{"tls-max", ARG_STRG, ' ', C_TLS_MAX},
{"tls13-ciphers", ARG_STRG, ' ', C_TLS13_CIPHERS},
@@ -1703,6 +1714,23 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
nextarg = (char *)"";
switch(cmd) {
+#ifdef HAVE_NTLS
+ case C_TLCP:
+ config->ssl_version = CURL_SSLVERSION_NTLSv1_1;
+ break;
+ case C_ENC_CERT:
+ err = getstr(&config->enc_cert, nextarg, DENY_BLANK);
+ break;
+ case C_ENC_KEY:
+ err = getstr(&config->enc_key, nextarg, DENY_BLANK);
+ break;
+ case C_SIGN_CERT:
+ err = getstr(&config->sign_cert, nextarg, DENY_BLANK);
+ break;
+ case C_SIGN_KEY:
+ err = getstr(&config->sign_key, nextarg, DENY_BLANK);
+ break;
+#endif
case C_RANDOM_FILE: /* --random-file */
case C_EGD_FILE: /* --egd-file */
case C_NTLM_WB: /* --ntlm-wb */
diff --git a/src/tool_getparam.h b/src/tool_getparam.h
index 90708e001..b1685b5f1 100644
--- a/src/tool_getparam.h
+++ b/src/tool_getparam.h
@@ -80,6 +80,10 @@ typedef enum {
C_DUMP_HEADER,
C_ECH,
C_EGD_FILE,
+#ifdef HAVE_NTLS
+ C_ENC_CERT,
+ C_ENC_KEY,
+#endif
C_ENGINE,
C_EPRT,
C_EPSV,
@@ -241,6 +245,10 @@ typedef enum {
C_SESSIONID,
C_SHOW_ERROR,
C_SHOW_HEADERS,
+#ifdef HAVE_NTLS
+ C_SIGN_CERT,
+ C_SIGN_KEY,
+#endif
C_SILENT,
C_SKIP_EXISTING,
C_SOCKS4,
@@ -271,6 +279,9 @@ typedef enum {
C_TEST_EVENT,
C_TFTP_BLKSIZE,
C_TFTP_NO_OPTIONS,
+#ifdef HAVE_NTLS
+ C_TLCP,
+#endif
C_TIME_COND,
C_TLS_EARLYDATA,
C_TLS_MAX,
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 1bba71f82..7496e281f 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1285,6 +1285,12 @@ static CURLcode config2setopts(struct GlobalConfig *global,
my_setopt_str(curl, CURLOPT_SSLKEYTYPE, config->key_type);
my_setopt_str(curl, CURLOPT_PROXY_SSLKEYTYPE,
config->proxy_key_type);
+#ifdef HAVE_NTLS
+ my_setopt_str(curl, CURLOPT_SSLSIGNCERT, config->sign_cert);
+ my_setopt_str(curl, CURLOPT_SSLSIGNKEY, config->sign_key);
+ my_setopt_str(curl, CURLOPT_SSLENCCERT, config->enc_cert);
+ my_setopt_str(curl, CURLOPT_SSLENCKEY, config->enc_key);
+#endif
/* libcurl default is strict verifyhost -> 1L, verifypeer -> 1L */
if(config->insecure_ok) {
diff --git a/tests/test1139.pl b/tests/test1139.pl
index 0c99ab6f3..7f9a12e11 100755
--- a/tests/test1139.pl
+++ b/tests/test1139.pl
@@ -183,6 +183,13 @@ my %opts = (
'--test-duphandle' => 6,
'--test-event' => 6,
'--wdebug' => 6,
+
+ # ignore
+ '--enc-key' => 7,
+ '--sign-cert' => 7,
+ '--enc-cert' => 7,
+ '--sign-key' => 7,
+ '--tlcp' => 7,
);
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index bc20d05d8..090a425d3 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -124,6 +124,14 @@ USE_UNICODE = true
USE_UNICODE = false
!ENDIF
+!IFNDEF ENABLE_NTLS
+USE_NTLS = false
+!ELSEIF "$(ENABLE_NTLS)"=="yes"
+USE_NTLS = true
+!ELSEIF "$(ENABLE_NTLS)"=="no"
+USE_NTLS = false
+!ENDIF
+
CONFIG_NAME_LIB = libcurl
!IF "$(WITH_SSL)"=="dll"
@@ -303,6 +311,7 @@ $(MODE):
@SET USE_UNICODE=$(USE_UNICODE)
# compatibility bit
@SET WITH_NGHTTP2=$(WITH_NGHTTP2)
+ @SET USE_NTLS=$(USE_NTLS)
@$(MAKE) /NOLOGO /F MakefileBuild.vc
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index aee03d564..006a963f9 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -141,6 +141,11 @@ SSL_CFLAGS = $(SSL_CFLAGS) /DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
!ENDIF
!ENDIF
+!IF "$(USE_NTLS)"=="true"
+SSL_CFLAGS = $(SSL_CFLAGS) /DUSE_NTLS
+CURL_CFLAGS = $(CURL_CFLAGS) /DUSE_NTLS
+!ENDIF
+
!IF "$(DISABLE_WEBSOCKETS)"=="true"
CFLAGS = $(CFLAGS) /DCURL_DISABLE_WEBSOCKETS=1
!ENDIF
diff --git a/docs/cmdline-opts/enc-key.md b/docs/cmdline-opts/enc-key.md
new file mode 100644
index 000000000..f16705980
--- /dev/null
+++ b/docs/cmdline-opts/enc-key.md
@@ -0,0 +1,21 @@
+---
+c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+SPDX-License-Identifier: curl
+Long: enc-key
+Arg: <key>
+Protocols: NTLS
+Help: Client encryption private key file
+Category: tls
+Added: 7.80.0
+Multi: single
+See-also:
+ - enc-cert
+ - sign-cert
+ - sign-key
+Example:
+ - --enc-cert certificate --enc-key key here $URL
+---
+
+# `--enc-key`
+
+Client encryption private key file.
diff --git a/docs/cmdline-opts/sign-key.md b/docs/cmdline-opts/sign-key.md
new file mode 100644
index 000000000..6658e60ef
--- /dev/null
+++ b/docs/cmdline-opts/sign-key.md
@@ -0,0 +1,21 @@
+---
+c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+SPDX-License-Identifier: curl
+Long: sign-key
+Arg: <key>
+Protocols: NTLS
+Help: Client signature private key file
+Category: tls
+Added: 7.80.0
+Multi: single
+See-also: