This repository has been archived by the owner on Jan 10, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 16
/
ossl-shim.patch
1470 lines (1347 loc) · 47.3 KB
/
ossl-shim.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
From 6a3645fcc6570dc88436906536ec4ef0102e3f1d Mon Sep 17 00:00:00 2001
From: David Benjamin <davidben@google.com>
Date: Sat, 5 Mar 2016 11:56:13 -0500
Subject: [PATCH 1/2] Make bssl_shim build against OpenSSL instead.
Copyright 2016 Google Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Not for landing, but uploaded so people can play with it. For the most
part this is removing BoringSSL-specific features and handling a few API
divergences.
(The DH_get_2048_256 API difference seems to have been an mistake on our
part when importing. I'll fix that one.)
This test suite includes tests for RC4 and SSL3. To avoid some false positives,
configure OpenSSL with:
enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers
To build, cd into ssl/test and run:
g++ -std=c++11 -I$openssl_dir/include *.cc $openssl_dir/libcrypto.a $openssl_dir/libssl.a -o ossl_shim
Then cd into ssl/test/runner
go test -shim-path ../ossl_shim
To run an individual test, run:
go test -shim-path ../ossl_shim -test TestNameHere
See ssl/test/runner/runner.go for additional options. The -debug and -gdb (or
-lldb) options may be useful.
Change-Id: I74d832207b970f1910b1baf6abd20e5f255aecee
---
crypto/test/scoped_types.h | 44 +---
ssl/test/async_bio.cc | 6 +-
ssl/test/bssl_shim.cc | 490 +++++----------------------------------------
ssl/test/packeted_bio.cc | 40 +---
ssl/test/packeted_bio.h | 4 +-
ssl/test/runner/runner.go | 7 +-
ssl/test/test_config.cc | 16 +-
7 files changed, 78 insertions(+), 529 deletions(-)
diff --git a/crypto/test/scoped_types.h b/crypto/test/scoped_types.h
index eef30e7..a1f6851 100644
--- a/crypto/test/scoped_types.h
+++ b/crypto/test/scoped_types.h
@@ -20,20 +20,16 @@
#include <memory>
-#include <openssl/aead.h>
#include <openssl/asn1.h>
#include <openssl/bio.h>
#include <openssl/bn.h>
+#include <openssl/crypto.h>
#include <openssl/cmac.h>
-#include <openssl/curve25519.h>
#include <openssl/dh.h>
#include <openssl/ecdsa.h>
#include <openssl/ec.h>
-#include <openssl/ec_key.h>
#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/mem.h>
-#include <openssl/pkcs8.h>
+#include <openssl/pkcs12.h>
#include <openssl/rsa.h>
#include <openssl/stack.h>
#include <openssl/x509.h>
@@ -74,29 +70,6 @@ template<typename StackType, typename T, void (*func)(T*)>
using ScopedOpenSSLStack =
std::unique_ptr<StackType, OpenSSLStackDeleter<StackType, T, func>>;
-template<typename T, typename CleanupRet, void (*init_func)(T*),
- CleanupRet (*cleanup_func)(T*)>
-class ScopedOpenSSLContext {
- public:
- ScopedOpenSSLContext() {
- init_func(&ctx_);
- }
- ~ScopedOpenSSLContext() {
- cleanup_func(&ctx_);
- }
-
- T *get() { return &ctx_; }
- const T *get() const { return &ctx_; }
-
- void Reset() {
- cleanup_func(&ctx_);
- init_func(&ctx_);
- }
-
- private:
- T ctx_;
-};
-
using ScopedASN1_TYPE = ScopedOpenSSLType<ASN1_TYPE, ASN1_TYPE_free>;
using ScopedBIO = ScopedOpenSSLType<BIO, BIO_vfree>;
using ScopedBIGNUM = ScopedOpenSSLType<BIGNUM, BN_free>;
@@ -113,7 +86,6 @@ using ScopedEVP_PKEY_CTX = ScopedOpenSSLType<EVP_PKEY_CTX, EVP_PKEY_CTX_free>;
using ScopedPKCS8_PRIV_KEY_INFO = ScopedOpenSSLType<PKCS8_PRIV_KEY_INFO,
PKCS8_PRIV_KEY_INFO_free>;
using ScopedPKCS12 = ScopedOpenSSLType<PKCS12, PKCS12_free>;
-using ScopedSPAKE2_CTX = ScopedOpenSSLType<SPAKE2_CTX, SPAKE2_CTX_free>;
using ScopedRSA = ScopedOpenSSLType<RSA, RSA_free>;
using ScopedX509 = ScopedOpenSSLType<X509, X509_free>;
using ScopedX509_ALGOR = ScopedOpenSSLType<X509_ALGOR, X509_ALGOR_free>;
@@ -122,18 +94,6 @@ using ScopedX509_STORE_CTX = ScopedOpenSSLType<X509_STORE_CTX, X509_STORE_CTX_fr
using ScopedX509Stack = ScopedOpenSSLStack<STACK_OF(X509), X509, X509_free>;
-using ScopedCBB = ScopedOpenSSLContext<CBB, void, CBB_zero, CBB_cleanup>;
-using ScopedEVP_AEAD_CTX = ScopedOpenSSLContext<EVP_AEAD_CTX, void,
- EVP_AEAD_CTX_zero,
- EVP_AEAD_CTX_cleanup>;
-using ScopedEVP_CIPHER_CTX = ScopedOpenSSLContext<EVP_CIPHER_CTX, int,
- EVP_CIPHER_CTX_init,
- EVP_CIPHER_CTX_cleanup>;
-using ScopedEVP_MD_CTX = ScopedOpenSSLContext<EVP_MD_CTX, int, EVP_MD_CTX_init,
- EVP_MD_CTX_cleanup>;
-using ScopedHMAC_CTX = ScopedOpenSSLContext<HMAC_CTX, void, HMAC_CTX_init,
- HMAC_CTX_cleanup>;
-
using ScopedOpenSSLBytes = std::unique_ptr<uint8_t, OpenSSLFree<uint8_t>>;
using ScopedOpenSSLString = std::unique_ptr<char, OpenSSLFree<char>>;
diff --git a/ssl/test/async_bio.cc b/ssl/test/async_bio.cc
index 7a5737b..965a0fb 100644
--- a/ssl/test/async_bio.cc
+++ b/ssl/test/async_bio.cc
@@ -17,12 +17,12 @@
#include <errno.h>
#include <string.h>
-#include <openssl/mem.h>
+#include <openssl/crypto.h>
namespace {
-extern const BIO_METHOD g_async_bio_method;
+extern BIO_METHOD g_async_bio_method;
struct AsyncBio {
bool datagram;
@@ -135,7 +135,7 @@ static long AsyncCallbackCtrl(BIO *bio, int cmd, bio_info_cb fp) {
return BIO_callback_ctrl(bio->next_bio, cmd, fp);
}
-const BIO_METHOD g_async_bio_method = {
+BIO_METHOD g_async_bio_method = {
BIO_TYPE_FILTER,
"async bio",
AsyncWrite,
diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
index 7da64bb..7de6aa3 100644
--- a/ssl/test/bssl_shim.cc
+++ b/ssl/test/bssl_shim.cc
@@ -16,9 +16,9 @@
#define __STDC_FORMAT_MACROS
#endif
-#include <openssl/base.h>
+#include <openssl/e_os2.h>
-#if !defined(OPENSSL_WINDOWS)
+#if !defined(OPENSSL_SYS_WINDOWS)
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
@@ -40,13 +40,13 @@
#include <string.h>
#include <openssl/bio.h>
-#include <openssl/buf.h>
-#include <openssl/bytestring.h>
-#include <openssl/cipher.h>
+#include <openssl/buffer.h>
#include <openssl/crypto.h>
+#include <openssl/dh.h>
#include <openssl/err.h>
+#include <openssl/evp.h>
#include <openssl/hmac.h>
-#include <openssl/obj.h>
+#include <openssl/objects.h>
#include <openssl/rand.h>
#include <openssl/ssl.h>
@@ -61,7 +61,7 @@
#include "test_config.h"
-#if !defined(OPENSSL_WINDOWS)
+#if !defined(OPENSSL_SYS_WINDOWS)
static int closesocket(int sock) {
return close(sock);
}
@@ -94,7 +94,6 @@ struct TestState {
// clock_delta is how far the clock advanced in the most recent failed
// |BIO_read|.
timeval clock_delta;
- ScopedEVP_PKEY channel_id;
bool cert_ready = false;
ScopedSSL_SESSION session;
ScopedSSL_SESSION pending_session;
@@ -154,143 +153,6 @@ static ScopedEVP_PKEY LoadPrivateKey(const std::string &file) {
return ScopedEVP_PKEY(PEM_read_bio_PrivateKey(bio.get(), NULL, NULL, NULL));
}
-static int AsyncPrivateKeyType(SSL *ssl) {
- return EVP_PKEY_id(GetTestState(ssl)->private_key.get());
-}
-
-static size_t AsyncPrivateKeyMaxSignatureLen(SSL *ssl) {
- return EVP_PKEY_size(GetTestState(ssl)->private_key.get());
-}
-
-static ssl_private_key_result_t AsyncPrivateKeySign(
- SSL *ssl, uint8_t *out, size_t *out_len, size_t max_out,
- const EVP_MD *md, const uint8_t *in, size_t in_len) {
- TestState *test_state = GetTestState(ssl);
- if (!test_state->private_key_result.empty()) {
- fprintf(stderr, "AsyncPrivateKeySign called with operation pending.\n");
- abort();
- }
-
- ScopedEVP_PKEY_CTX ctx(EVP_PKEY_CTX_new(test_state->private_key.get(),
- nullptr));
- if (!ctx) {
- return ssl_private_key_failure;
- }
-
- // Write the signature into |test_state|.
- size_t len = 0;
- if (!EVP_PKEY_sign_init(ctx.get()) ||
- !EVP_PKEY_CTX_set_signature_md(ctx.get(), md) ||
- !EVP_PKEY_sign(ctx.get(), nullptr, &len, in, in_len)) {
- return ssl_private_key_failure;
- }
- test_state->private_key_result.resize(len);
- if (!EVP_PKEY_sign(ctx.get(), test_state->private_key_result.data(), &len, in,
- in_len)) {
- return ssl_private_key_failure;
- }
- test_state->private_key_result.resize(len);
-
- // The signature will be released asynchronously in
- // |AsyncPrivateKeySignComplete|.
- return ssl_private_key_retry;
-}
-
-static ssl_private_key_result_t AsyncPrivateKeySignComplete(
- SSL *ssl, uint8_t *out, size_t *out_len, size_t max_out) {
- TestState *test_state = GetTestState(ssl);
- if (test_state->private_key_result.empty()) {
- fprintf(stderr,
- "AsyncPrivateKeySignComplete called without operation pending.\n");
- abort();
- }
-
- if (test_state->private_key_retries < 2) {
- // Only return the signature on the second attempt, to test both incomplete
- // |sign| and |sign_complete|.
- return ssl_private_key_retry;
- }
-
- if (max_out < test_state->private_key_result.size()) {
- fprintf(stderr, "Output buffer too small.\n");
- return ssl_private_key_failure;
- }
- memcpy(out, test_state->private_key_result.data(),
- test_state->private_key_result.size());
- *out_len = test_state->private_key_result.size();
-
- test_state->private_key_result.clear();
- test_state->private_key_retries = 0;
- return ssl_private_key_success;
-}
-
-static ssl_private_key_result_t AsyncPrivateKeyDecrypt(
- SSL *ssl, uint8_t *out, size_t *out_len, size_t max_out,
- const uint8_t *in, size_t in_len) {
- TestState *test_state = GetTestState(ssl);
- if (!test_state->private_key_result.empty()) {
- fprintf(stderr,
- "AsyncPrivateKeyDecrypt called with operation pending.\n");
- abort();
- }
-
- RSA *rsa = EVP_PKEY_get0_RSA(test_state->private_key.get());
- if (rsa == NULL) {
- fprintf(stderr,
- "AsyncPrivateKeyDecrypt called with incorrect key type.\n");
- abort();
- }
- test_state->private_key_result.resize(RSA_size(rsa));
- if (!RSA_decrypt(rsa, out_len, test_state->private_key_result.data(),
- RSA_size(rsa), in, in_len, RSA_NO_PADDING)) {
- return ssl_private_key_failure;
- }
-
- test_state->private_key_result.resize(*out_len);
-
- // The decryption will be released asynchronously in
- // |AsyncPrivateKeyDecryptComplete|.
- return ssl_private_key_retry;
-}
-
-static ssl_private_key_result_t AsyncPrivateKeyDecryptComplete(
- SSL *ssl, uint8_t *out, size_t *out_len, size_t max_out) {
- TestState *test_state = GetTestState(ssl);
- if (test_state->private_key_result.empty()) {
- fprintf(stderr,
- "AsyncPrivateKeyDecryptComplete called without operation "
- "pending.\n");
- abort();
- }
-
- if (test_state->private_key_retries < 2) {
- // Only return the decryption on the second attempt, to test both incomplete
- // |decrypt| and |decrypt_complete|.
- return ssl_private_key_retry;
- }
-
- if (max_out < test_state->private_key_result.size()) {
- fprintf(stderr, "Output buffer too small.\n");
- return ssl_private_key_failure;
- }
- memcpy(out, test_state->private_key_result.data(),
- test_state->private_key_result.size());
- *out_len = test_state->private_key_result.size();
-
- test_state->private_key_result.clear();
- test_state->private_key_retries = 0;
- return ssl_private_key_success;
-}
-
-static const SSL_PRIVATE_KEY_METHOD g_async_private_key_method = {
- AsyncPrivateKeyType,
- AsyncPrivateKeyMaxSignatureLen,
- AsyncPrivateKeySign,
- AsyncPrivateKeySignComplete,
- AsyncPrivateKeyDecrypt,
- AsyncPrivateKeyDecryptComplete
-};
-
template<typename T>
struct Free {
void operator()(T *buf) {
@@ -303,24 +165,8 @@ static bool GetCertificate(SSL *ssl, ScopedX509 *out_x509,
const TestConfig *config = GetConfigPtr(ssl);
if (!config->digest_prefs.empty()) {
- std::unique_ptr<char, Free<char>> digest_prefs(
- strdup(config->digest_prefs.c_str()));
- std::vector<int> digest_list;
-
- for (;;) {
- char *token =
- strtok(digest_list.empty() ? digest_prefs.get() : nullptr, ",");
- if (token == nullptr) {
- break;
- }
-
- digest_list.push_back(EVP_MD_type(EVP_get_digestbyname(token)));
- }
-
- if (!SSL_set_private_key_digest_prefs(ssl, digest_list.data(),
- digest_list.size())) {
- return false;
- }
+ fprintf(stderr, "Digest prefs not supported.\n");
+ return false;
}
if (!config->key_file.empty()) {
@@ -335,10 +181,8 @@ static bool GetCertificate(SSL *ssl, ScopedX509 *out_x509,
return false;
}
}
- if (!config->ocsp_response.empty() &&
- !SSL_CTX_set_ocsp_response(ssl->ctx,
- (const uint8_t *)config->ocsp_response.data(),
- config->ocsp_response.size())) {
+ if (!config->ocsp_response.empty()) {
+ fprintf(stderr, "OCSP response not supported.\n");
return false;
}
return true;
@@ -354,10 +198,7 @@ static bool InstallCertificate(SSL *ssl) {
if (pkey) {
TestState *test_state = GetTestState(ssl);
const TestConfig *config = GetConfigPtr(ssl);
- if (config->async) {
- test_state->private_key = std::move(pkey);
- SSL_set_private_key_method(ssl, &g_async_private_key_method);
- } else if (!SSL_use_PrivateKey(ssl, pkey.get())) {
+ if (!SSL_use_PrivateKey(ssl, pkey.get())) {
return false;
}
}
@@ -369,58 +210,6 @@ static bool InstallCertificate(SSL *ssl) {
return true;
}
-static int SelectCertificateCallback(const struct ssl_early_callback_ctx *ctx) {
- const TestConfig *config = GetConfigPtr(ctx->ssl);
- GetTestState(ctx->ssl)->early_callback_called = true;
-
- if (!config->expected_server_name.empty()) {
- const uint8_t *extension_data;
- size_t extension_len;
- CBS extension, server_name_list, host_name;
- uint8_t name_type;
-
- if (!SSL_early_callback_ctx_extension_get(ctx, TLSEXT_TYPE_server_name,
- &extension_data,
- &extension_len)) {
- fprintf(stderr, "Could not find server_name extension.\n");
- return -1;
- }
-
- CBS_init(&extension, extension_data, extension_len);
- if (!CBS_get_u16_length_prefixed(&extension, &server_name_list) ||
- CBS_len(&extension) != 0 ||
- !CBS_get_u8(&server_name_list, &name_type) ||
- name_type != TLSEXT_NAMETYPE_host_name ||
- !CBS_get_u16_length_prefixed(&server_name_list, &host_name) ||
- CBS_len(&server_name_list) != 0) {
- fprintf(stderr, "Could not decode server_name extension.\n");
- return -1;
- }
-
- if (!CBS_mem_equal(&host_name,
- (const uint8_t*)config->expected_server_name.data(),
- config->expected_server_name.size())) {
- fprintf(stderr, "Server name mismatch.\n");
- }
- }
-
- if (config->fail_early_callback) {
- return -1;
- }
-
- // Install the certificate in the early callback.
- if (config->use_early_callback) {
- if (config->async) {
- // Install the certificate asynchronously.
- return 0;
- }
- if (!InstallCertificate(ctx->ssl)) {
- return -1;
- }
- }
- return 1;
-}
-
static int ClientCertCallback(SSL *ssl, X509 **out_x509, EVP_PKEY **out_pkey) {
if (GetConfigPtr(ssl)->async && !GetTestState(ssl)->cert_ready) {
return -1;
@@ -444,20 +233,6 @@ static int ClientCertCallback(SSL *ssl, X509 **out_x509, EVP_PKEY **out_pkey) {
}
static int VerifySucceed(X509_STORE_CTX *store_ctx, void *arg) {
- SSL* ssl = (SSL*)X509_STORE_CTX_get_ex_data(store_ctx,
- SSL_get_ex_data_X509_STORE_CTX_idx());
- const TestConfig *config = GetConfigPtr(ssl);
-
- if (!config->expected_ocsp_response.empty()) {
- const uint8_t *data;
- size_t len;
- SSL_get0_ocsp_response(ssl, &data, &len);
- if (len == 0) {
- fprintf(stderr, "OCSP response not available in verify callback\n");
- return 0;
- }
- }
-
return 1;
}
@@ -552,14 +327,6 @@ static unsigned PskServerCallback(SSL *ssl, const char *identity,
return config->psk.size();
}
-static void CurrentTimeCallback(const SSL *ssl, timeval *out_clock) {
- *out_clock = GetTestState(ssl)->clock;
-}
-
-static void ChannelIdCallback(SSL *ssl, EVP_PKEY **out_pkey) {
- *out_pkey = GetTestState(ssl)->channel_id.release();
-}
-
static int CertCallback(SSL *ssl, void *arg) {
if (!GetTestState(ssl)->cert_ready) {
return -1;
@@ -570,31 +337,6 @@ static int CertCallback(SSL *ssl, void *arg) {
return 1;
}
-static SSL_SESSION *GetSessionCallback(SSL *ssl, uint8_t *data, int len,
- int *copy) {
- TestState *async_state = GetTestState(ssl);
- if (async_state->session) {
- *copy = 0;
- return async_state->session.release();
- } else if (async_state->pending_session) {
- return SSL_magic_pending_session_ptr();
- } else {
- return NULL;
- }
-}
-
-static int DDoSCallback(const struct ssl_early_callback_ctx *early_context) {
- const TestConfig *config = GetConfigPtr(early_context->ssl);
- static int callback_num = 0;
-
- callback_num++;
- if (config->fail_ddos_callback ||
- (config->fail_second_ddos_callback && callback_num == 2)) {
- return 0;
- }
- return 1;
-}
-
static void InfoCallback(const SSL *ssl, int type, int val) {
if (type == SSL_CB_HANDSHAKE_DONE) {
if (GetConfigPtr(ssl)->handshake_never_done) {
@@ -769,18 +511,12 @@ static ScopedSSL_CTX SetupCtx(const TestConfig *config) {
return nullptr;
}
- if (!config->cipher_tls10.empty() &&
- !SSL_CTX_set_cipher_list_tls10(ssl_ctx.get(),
- config->cipher_tls10.c_str())) {
- return nullptr;
- }
- if (!config->cipher_tls11.empty() &&
- !SSL_CTX_set_cipher_list_tls11(ssl_ctx.get(),
- config->cipher_tls11.c_str())) {
+ if (!config->cipher_tls10.empty() || !config->cipher_tls11.empty()) {
+ fprintf(stderr, "version-specific cipher lists not supported.\n");
return nullptr;
}
- ScopedDH dh(DH_get_2048_256(NULL));
+ ScopedDH dh(DH_get_2048_256());
if (config->use_sparse_dh_prime) {
// This prime number is 2^1024 + 643 – a value just above a power of two.
@@ -798,24 +534,14 @@ static ScopedSSL_CTX SetupCtx(const TestConfig *config) {
}
BN_free(dh->q);
dh->q = NULL;
- dh->priv_length = 0;
+ dh->length = 0;
}
if (!dh || !SSL_CTX_set_tmp_dh(ssl_ctx.get(), dh.get())) {
return nullptr;
}
- if (config->async && config->is_server) {
- // Disable the internal session cache. To test asynchronous session lookup,
- // we use an external session cache.
- SSL_CTX_set_session_cache_mode(
- ssl_ctx.get(), SSL_SESS_CACHE_BOTH | SSL_SESS_CACHE_NO_INTERNAL);
- SSL_CTX_sess_set_get_cb(ssl_ctx.get(), GetSessionCallback);
- } else {
- SSL_CTX_set_session_cache_mode(ssl_ctx.get(), SSL_SESS_CACHE_BOTH);
- }
-
- SSL_CTX_set_select_certificate_cb(ssl_ctx.get(), SelectCertificateCallback);
+ SSL_CTX_set_session_cache_mode(ssl_ctx.get(), SSL_SESS_CACHE_BOTH);
if (config->use_old_client_cert_callback) {
SSL_CTX_set_client_cert_cb(ssl_ctx.get(), ClientCertCallback);
@@ -832,11 +558,6 @@ static ScopedSSL_CTX SetupCtx(const TestConfig *config) {
SSL_CTX_set_alpn_select_cb(ssl_ctx.get(), AlpnSelectCallback, NULL);
}
- SSL_CTX_enable_tls_channel_id(ssl_ctx.get());
- SSL_CTX_set_channel_id_cb(ssl_ctx.get(), ChannelIdCallback);
-
- ssl_ctx->current_time_cb = CurrentTimeCallback;
-
SSL_CTX_set_info_callback(ssl_ctx.get(), InfoCallback);
SSL_CTX_sess_set_new_cb(ssl_ctx.get(), NewSessionCallback);
@@ -866,10 +587,8 @@ static ScopedSSL_CTX SetupCtx(const TestConfig *config) {
SSL_CTX_set_cert_verify_callback(ssl_ctx.get(), VerifySucceed, NULL);
}
- if (!config->signed_cert_timestamps.empty() &&
- !SSL_CTX_set_signed_cert_timestamp_list(
- ssl_ctx.get(), (const uint8_t *)config->signed_cert_timestamps.data(),
- config->signed_cert_timestamps.size())) {
+ if (!config->signed_cert_timestamps.empty()) {
+ fprintf(stderr, "SCTs not supported.\n");
return nullptr;
}
@@ -922,26 +641,9 @@ static bool RetryAsync(SSL *ssl, int ret) {
case SSL_ERROR_WANT_WRITE:
AsyncBioAllowWrite(test_state->async_bio, 1);
return true;
- case SSL_ERROR_WANT_CHANNEL_ID_LOOKUP: {
- ScopedEVP_PKEY pkey = LoadPrivateKey(GetConfigPtr(ssl)->send_channel_id);
- if (!pkey) {
- return false;
- }
- test_state->channel_id = std::move(pkey);
- return true;
- }
case SSL_ERROR_WANT_X509_LOOKUP:
test_state->cert_ready = true;
return true;
- case SSL_ERROR_PENDING_SESSION:
- test_state->session = std::move(test_state->pending_session);
- return true;
- case SSL_ERROR_PENDING_CERTIFICATE:
- // The handshake will resume without a second call to the early callback.
- return InstallCertificate(ssl);
- case SSL_ERROR_WANT_PRIVATE_KEY_OPERATION:
- test_state->private_key_retries++;
- return true;
default:
return false;
}
@@ -1031,11 +733,6 @@ static bool CheckHandshakeProperties(SSL *ssl, bool is_resume) {
}
}
- if (config->is_server && !GetTestState(ssl)->early_callback_called) {
- fprintf(stderr, "early callback not called\n");
- return false;
- }
-
if (!config->expected_server_name.empty()) {
const char *server_name =
SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
@@ -1083,50 +780,6 @@ static bool CheckHandshakeProperties(SSL *ssl, bool is_resume) {
}
}
- if (!config->expected_channel_id.empty()) {
- uint8_t channel_id[64];
- if (!SSL_get_tls_channel_id(ssl, channel_id, sizeof(channel_id))) {
- fprintf(stderr, "no channel id negotiated\n");
- return false;
- }
- if (config->expected_channel_id.size() != 64 ||
- memcmp(config->expected_channel_id.data(),
- channel_id, 64) != 0) {
- fprintf(stderr, "channel id mismatch\n");
- return false;
- }
- }
-
- if (config->expect_extended_master_secret) {
- if (!ssl->session->extended_master_secret) {
- fprintf(stderr, "No EMS for session when expected");
- return false;
- }
- }
-
- if (!config->expected_ocsp_response.empty()) {
- const uint8_t *data;
- size_t len;
- SSL_get0_ocsp_response(ssl, &data, &len);
- if (config->expected_ocsp_response.size() != len ||
- memcmp(config->expected_ocsp_response.data(), data, len) != 0) {
- fprintf(stderr, "OCSP response mismatch\n");
- return false;
- }
- }
-
- if (!config->expected_signed_cert_timestamps.empty()) {
- const uint8_t *data;
- size_t len;
- SSL_get0_signed_cert_timestamp_list(ssl, &data, &len);
- if (config->expected_signed_cert_timestamps.size() != len ||
- memcmp(config->expected_signed_cert_timestamps.data(),
- data, len) != 0) {
- fprintf(stderr, "SCT list mismatch\n");
- return false;
- }
- }
-
if (config->expect_verify_result) {
int expected_verify_result = config->verify_fail ?
X509_V_ERR_APPLICATION_VERIFICATION :
@@ -1138,24 +791,6 @@ static bool CheckHandshakeProperties(SSL *ssl, bool is_resume) {
}
}
- if (config->expect_server_key_exchange_hash != 0 &&
- config->expect_server_key_exchange_hash !=
- SSL_get_server_key_exchange_hash(ssl)) {
- fprintf(stderr, "ServerKeyExchange hash was %d, wanted %d.\n",
- SSL_get_server_key_exchange_hash(ssl),
- config->expect_server_key_exchange_hash);
- return false;
- }
-
- if (config->expect_key_exchange_info != 0) {
- uint32_t info = SSL_SESSION_get_key_exchange_info(SSL_get_session(ssl));
- if (static_cast<uint32_t>(config->expect_key_exchange_info) != info) {
- fprintf(stderr, "key_exchange_info was %" PRIu32 ", wanted %" PRIu32 "\n",
- info, static_cast<uint32_t>(config->expect_key_exchange_info));
- return false;
- }
- }
-
if (!config->is_server) {
/* Clients should expect a peer certificate chain iff this was not a PSK
* cipher suite. */
@@ -1199,6 +834,9 @@ static bool DoExchange(ScopedSSL_SESSION *out_session, SSL_CTX *ssl_ctx,
} else if (!InstallCertificate(ssl.get())) {
return false;
}
+ } else {
+ fprintf(stderr, "Early callback not supported.\n");
+ return false;
}
if (config->require_any_client_certificate) {
SSL_set_verify(ssl.get(), SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
@@ -1208,10 +846,8 @@ static bool DoExchange(ScopedSSL_SESSION *out_session, SSL_CTX *ssl_ctx,
SSL_set_verify(ssl.get(), SSL_VERIFY_PEER, NULL);
}
if (config->false_start) {
- SSL_set_mode(ssl.get(), SSL_MODE_ENABLE_FALSE_START);
- }
- if (config->cbc_record_splitting) {
- SSL_set_mode(ssl.get(), SSL_MODE_CBC_RECORD_SPLITTING);
+ fprintf(stderr, "False Start not supported\n");
+ return false;
}
if (config->partial_write) {
SSL_set_mode(ssl.get(), SSL_MODE_ENABLE_PARTIAL_WRITE);
@@ -1229,17 +865,12 @@ static bool DoExchange(ScopedSSL_SESSION *out_session, SSL_CTX *ssl_ctx,
SSL_set_options(ssl.get(), SSL_OP_NO_SSLv3);
}
if (!config->expected_channel_id.empty()) {
- SSL_enable_tls_channel_id(ssl.get());
+ fprintf(stderr, "Channel ID not supported\n");
+ return false;
}
if (!config->send_channel_id.empty()) {
- SSL_enable_tls_channel_id(ssl.get());
- if (!config->async) {
- // The async case will be supplied by |ChannelIdCallback|.
- ScopedEVP_PKEY pkey = LoadPrivateKey(config->send_channel_id);
- if (!pkey || !SSL_set1_tls_channel_id(ssl.get(), pkey.get())) {
- return false;
- }
- }
+ fprintf(stderr, "Channel ID not supported\n");
+ return false;
}
if (!config->host_name.empty() &&
!SSL_set_tlsext_host_name(ssl.get(), config->host_name.c_str())) {
@@ -1260,44 +891,48 @@ static bool DoExchange(ScopedSSL_SESSION *out_session, SSL_CTX *ssl_ctx,
return false;
}
if (!config->srtp_profiles.empty() &&
- !SSL_set_srtp_profiles(ssl.get(), config->srtp_profiles.c_str())) {
+ SSL_set_tlsext_use_srtp(ssl.get(), config->srtp_profiles.c_str())) {
return false;
}
- if (config->enable_ocsp_stapling &&
- !SSL_enable_ocsp_stapling(ssl.get())) {
+ if (config->enable_ocsp_stapling) {
+ fprintf(stderr, "OCSP stapling not supported (with the same API).\n");
return false;
}
- if (config->enable_signed_cert_timestamps &&
- !SSL_enable_signed_cert_timestamps(ssl.get())) {
+ if (config->enable_signed_cert_timestamps) {
+ fprintf(stderr, "SCTs not supported (with the same API).\n");
return false;
}
if (config->min_version != 0) {
- SSL_set_min_version(ssl.get(), (uint16_t)config->min_version);
+ SSL_set_min_proto_version(ssl.get(), (uint16_t)config->min_version);
}
if (config->max_version != 0) {
- SSL_set_max_version(ssl.get(), (uint16_t)config->max_version);
+ SSL_set_max_proto_version(ssl.get(), (uint16_t)config->max_version);
}
if (config->mtu != 0) {
SSL_set_options(ssl.get(), SSL_OP_NO_QUERY_MTU);
SSL_set_mtu(ssl.get(), config->mtu);
}
if (config->install_ddos_callback) {
- SSL_CTX_set_dos_protection_cb(ssl_ctx, DDoSCallback);
+ fprintf(stderr, "DDoS callback not supported.\n");
+ return false;
}
if (config->renegotiate_once) {
- SSL_set_renegotiate_mode(ssl.get(), ssl_renegotiate_once);
+ fprintf(stderr, "renegotiate_once not supported.\n");
+ return false;
}
if (config->renegotiate_freely) {
- SSL_set_renegotiate_mode(ssl.get(), ssl_renegotiate_freely);
+ // This is always on for OpenSSL.
}
if (config->renegotiate_ignore) {
- SSL_set_renegotiate_mode(ssl.get(), ssl_renegotiate_ignore);
+ fprintf(stderr, "renegotiate_ignore not supported.\n");
+ return false;
}
if (!config->check_close_notify) {
SSL_set_quiet_shutdown(ssl.get(), 1);
}
if (config->disable_npn) {
- SSL_set_options(ssl.get(), SSL_OP_DISABLE_NPN);
+ fprintf(stderr, "SSL_OP_DISABLE_NPN not supported.\n");
+ return false;
}
if (config->p384_only) {
int nid = NID_secp384r1;
@@ -1346,18 +981,17 @@ static bool DoExchange(ScopedSSL_SESSION *out_session, SSL_CTX *ssl_ctx,
if (SSL_set_session(ssl.get(), session) != 1) {
return false;
}
- } else if (config->async) {
- // The internal session cache is disabled, so install the session
- // manually.
- GetTestState(ssl.get())->pending_session.reset(
- SSL_SESSION_up_ref(session));
}
}
+#if 0
+ // KNOWN BUG: OpenSSL's SSL_get_current_cipher behaves incorrectly when
+ // offering resumption.
if (SSL_get_current_cipher(ssl.get()) != nullptr) {
fprintf(stderr, "non-null cipher before handshake\n");
return false;
}
+#endif
int ret;
if (config->implicit_handshake) {
@@ -1387,11 +1021,11 @@ static bool DoExchange(ScopedSSL_SESSION *out_session, SSL_CTX *ssl_ctx,
if (config->export_keying_material > 0) {
std::vector<uint8_t> result(
static_cast<size_t>(config->export_keying_material));
- if (!SSL_export_keying_material(
+ if (SSL_export_keying_material(
ssl.get(), result.data(), result.size(),
config->export_label.data(), config->export_label.size(),
reinterpret_cast<const uint8_t*>(config->export_context.data()),
- config->export_context.size(), config->use_export_context)) {
+ config->export_context.size(), config->use_export_context) != 1) {
fprintf(stderr, "failed to export keying material\n");
return false;
}
@@ -1401,23 +1035,8 @@ static bool DoExchange(ScopedSSL_SESSION *out_session, SSL_CTX *ssl_ctx,
}
if (config->tls_unique) {
- uint8_t tls_unique[16];
- size_t tls_unique_len;
- if (!SSL_get_tls_unique(ssl.get(), tls_unique, &tls_unique_len,
- sizeof(tls_unique))) {
- fprintf(stderr, "failed to get tls-unique\n");
- return false;
- }
-
- if (tls_unique_len != 12) {
- fprintf(stderr, "expected 12 bytes of tls-unique but got %u",
- static_cast<unsigned>(tls_unique_len));
- return false;
- }
-
- if (WriteAll(ssl.get(), tls_unique, tls_unique_len) < 0) {
- return false;
- }
+ fprintf(stderr, "tls_unique not supported\n");
+ return false;
}
if (config->write_different_record_sizes) {
@@ -1528,7 +1147,7 @@ static bool DoExchange(ScopedSSL_SESSION *out_session, SSL_CTX *ssl_ctx,
if (SSL_total_renegotiations(ssl.get()) !=
config->expect_total_renegotiations) {
- fprintf(stderr, "Expected %d renegotiations, got %d\n",
+ fprintf(stderr, "Expected %d renegotiations, got %ld\n",
config->expect_total_renegotiations,
SSL_total_renegotiations(ssl.get()));
return false;
@@ -1564,7 +1183,8 @@ int main(int argc, char **argv) {
signal(SIGPIPE, SIG_IGN);
#endif
- CRYPTO_library_init();
+ OPENSSL_init_crypto(0, NULL);
+ OPENSSL_init_ssl(0, NULL);
g_config_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
g_state_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, TestStateExFree);
if (g_config_index < 0 || g_state_index < 0) {
diff --git a/ssl/test/packeted_bio.cc b/ssl/test/packeted_bio.cc
index e831082..dd97df1 100644
--- a/ssl/test/packeted_bio.cc
+++ b/ssl/test/packeted_bio.cc
@@ -19,16 +19,15 @@
#include <stdio.h>
#include <string.h>
-#include <openssl/mem.h>
+#include <openssl/crypto.h>
namespace {
-extern const BIO_METHOD g_packeted_bio_method;
+extern BIO_METHOD g_packeted_bio_method;
const uint8_t kOpcodePacket = 'P';
const uint8_t kOpcodeTimeout = 'T';
-const uint8_t kOpcodeTimeoutAck = 't';
// ReadAll reads |len| bytes from |bio| into |out|. It returns 1 on success and
// 0 or -1 on error.
@@ -94,38 +93,7 @@ static int PacketedRead(BIO *bio, char *out, int outl) {
}
if (opcode == kOpcodeTimeout) {
- // Process the timeout.
- uint8_t buf[8];
- ret = ReadAll(bio->next_bio, buf, sizeof(buf));
- if (ret <= 0) {
- BIO_copy_next_retry(bio);
- return ret;
- }
- uint64_t timeout = (static_cast<uint64_t>(buf[0]) << 56) |
- (static_cast<uint64_t>(buf[1]) << 48) |
- (static_cast<uint64_t>(buf[2]) << 40) |
- (static_cast<uint64_t>(buf[3]) << 32) |
- (static_cast<uint64_t>(buf[4]) << 24) |
- (static_cast<uint64_t>(buf[5]) << 16) |
- (static_cast<uint64_t>(buf[6]) << 8) |
- static_cast<uint64_t>(buf[7]);
- timeout /= 1000; // Convert nanoseconds to microseconds.
- timeval *out_timeout = reinterpret_cast<timeval *>(bio->ptr);
- assert(out_timeout->tv_usec == 0);
- assert(out_timeout->tv_sec == 0);
- out_timeout->tv_usec = timeout % 1000000;
- out_timeout->tv_sec = timeout / 1000000;
-
- // Send an ACK to the peer.
- ret = BIO_write(bio->next_bio, &kOpcodeTimeoutAck, 1);
- if (ret <= 0) {
- return ret;
- }
- assert(ret == 1);
-
- // Signal to the caller to retry the read, after processing the
- // new clock.
- BIO_set_retry_read(bio);
+ fprintf(stderr, "Timeout simulation not supported.\n");
return -1;
}
@@ -193,7 +161,7 @@ static long PacketedCallbackCtrl(BIO *bio, int cmd, bio_info_cb fp) {
return BIO_callback_ctrl(bio->next_bio, cmd, fp);
}
-const BIO_METHOD g_packeted_bio_method = {
+BIO_METHOD g_packeted_bio_method = {
BIO_TYPE_FILTER,
"packeted bio",
PacketedWrite,
diff --git a/ssl/test/packeted_bio.h b/ssl/test/packeted_bio.h
index 75cfa13..61e6b25 100644
--- a/ssl/test/packeted_bio.h
+++ b/ssl/test/packeted_bio.h
@@ -15,12 +15,12 @@
#ifndef HEADER_PACKETED_BIO
#define HEADER_PACKETED_BIO