1
1
#![ no_std]
2
2
#![ feature( c_variadic) ]
3
- #![ feature( async_fn_in_trait) ]
4
- #![ feature( impl_trait_projections) ]
5
3
#![ allow( incomplete_features) ]
6
4
7
5
use embedded_io:: ErrorType ;
@@ -376,18 +374,18 @@ impl<'a> Certificates<'a> {
376
374
}
377
375
}
378
376
379
- pub struct Session < ' a , T > {
380
- stream : & ' a mut T ,
377
+ pub struct Session < T > {
378
+ stream : T ,
381
379
ssl_context : * mut mbedtls_ssl_context ,
382
380
ssl_config : * mut mbedtls_ssl_config ,
383
381
crt : * mut mbedtls_x509_crt ,
384
382
client_crt : * mut mbedtls_x509_crt ,
385
383
private_key : * mut mbedtls_pk_context ,
386
384
}
387
385
388
- impl < ' a , T > Session < ' a , T > {
386
+ impl < T > Session < T > {
389
387
pub fn new (
390
- stream : & ' a mut T ,
388
+ stream : T ,
391
389
servername : & str ,
392
390
mode : Mode ,
393
391
min_version : TlsVersion ,
@@ -406,11 +404,11 @@ impl<'a, T> Session<'a, T> {
406
404
}
407
405
}
408
406
409
- impl < ' a , T > Session < ' a , T >
407
+ impl < T > Session < T >
410
408
where
411
409
T : Read + Write ,
412
410
{
413
- pub fn connect < ' b > ( self ) -> Result < ConnectedSession < ' a , T > , TlsError > {
411
+ pub fn connect < ' b > ( self ) -> Result < ConnectedSession < T > , TlsError > {
414
412
unsafe {
415
413
mbedtls_ssl_set_bio (
416
414
self . ssl_context ,
@@ -509,7 +507,7 @@ where
509
507
}
510
508
}
511
509
512
- impl < ' a , T > Drop for Session < ' a , T > {
510
+ impl < T > Drop for Session < T > {
513
511
fn drop ( & mut self ) {
514
512
log:: debug!( "session dropped - freeing memory" ) ;
515
513
unsafe {
@@ -528,21 +526,21 @@ impl<'a, T> Drop for Session<'a, T> {
528
526
}
529
527
}
530
528
531
- pub struct ConnectedSession < ' a , T >
529
+ pub struct ConnectedSession < T >
532
530
where
533
531
T : Read + Write ,
534
532
{
535
- session : Session < ' a , T > ,
533
+ session : Session < T > ,
536
534
}
537
535
538
- impl < ' a , T > ErrorType for ConnectedSession < ' a , T >
536
+ impl < T > ErrorType for ConnectedSession < T >
539
537
where
540
538
T : Read + Write ,
541
539
{
542
540
type Error = TlsError ;
543
541
}
544
542
545
- impl < ' a , T > Read for ConnectedSession < ' a , T >
543
+ impl < T > Read for ConnectedSession < T >
546
544
where
547
545
T : Read + Write ,
548
546
{
@@ -560,7 +558,7 @@ where
560
558
}
561
559
}
562
560
563
- impl < ' a , T > Write for ConnectedSession < ' a , T >
561
+ impl < T > Write for ConnectedSession < T >
564
562
where
565
563
T : Read + Write ,
566
564
{
@@ -578,8 +576,8 @@ where
578
576
pub mod asynch {
579
577
use super :: * ;
580
578
581
- pub struct Session < ' a , T , const BUFFER_SIZE : usize = 4096 > {
582
- stream : & ' a mut T ,
579
+ pub struct Session < T , const BUFFER_SIZE : usize = 4096 > {
580
+ stream : T ,
583
581
ssl_context : * mut mbedtls_ssl_context ,
584
582
ssl_config : * mut mbedtls_ssl_config ,
585
583
crt : * mut mbedtls_x509_crt ,
@@ -590,9 +588,9 @@ pub mod asynch {
590
588
rx_buffer : BufferedBytes < BUFFER_SIZE > ,
591
589
}
592
590
593
- impl < ' a , T , const BUFFER_SIZE : usize > Session < ' a , T , BUFFER_SIZE > {
591
+ impl < T , const BUFFER_SIZE : usize > Session < T , BUFFER_SIZE > {
594
592
pub fn new (
595
- stream : & ' a mut T ,
593
+ stream : T ,
596
594
servername : & str ,
597
595
mode : Mode ,
598
596
min_version : TlsVersion ,
@@ -614,7 +612,7 @@ pub mod asynch {
614
612
}
615
613
}
616
614
617
- impl < ' a , T , const BUFFER_SIZE : usize > Drop for Session < ' a , T , BUFFER_SIZE > {
615
+ impl < T , const BUFFER_SIZE : usize > Drop for Session < T , BUFFER_SIZE > {
618
616
fn drop ( & mut self ) {
619
617
log:: debug!( "session dropped - freeing memory" ) ;
620
618
unsafe {
@@ -633,13 +631,13 @@ pub mod asynch {
633
631
}
634
632
}
635
633
636
- impl < ' a , T , const BUFFER_SIZE : usize > Session < ' a , T , BUFFER_SIZE >
634
+ impl < T , const BUFFER_SIZE : usize > Session < T , BUFFER_SIZE >
637
635
where
638
636
T : embedded_io_async:: Read + embedded_io_async:: Write ,
639
637
{
640
638
pub async fn connect < ' b > (
641
639
mut self ,
642
- ) -> Result < AsyncConnectedSession < ' a , T , BUFFER_SIZE > , TlsError > {
640
+ ) -> Result < AsyncConnectedSession < T , BUFFER_SIZE > , TlsError > {
643
641
unsafe {
644
642
mbedtls_ssl_set_bio (
645
643
self . ssl_context ,
@@ -841,23 +839,22 @@ pub mod asynch {
841
839
}
842
840
}
843
841
844
- pub struct AsyncConnectedSession < ' a , T , const BUFFER_SIZE : usize >
842
+ pub struct AsyncConnectedSession < T , const BUFFER_SIZE : usize >
845
843
where
846
844
T : embedded_io_async:: Read + embedded_io_async:: Write ,
847
845
{
848
- pub ( crate ) session : Session < ' a , T , BUFFER_SIZE > ,
846
+ pub ( crate ) session : Session < T , BUFFER_SIZE > ,
849
847
}
850
848
851
- impl < ' a , T , const BUFFER_SIZE : usize > embedded_io_async:: ErrorType
852
- for AsyncConnectedSession < ' a , T , BUFFER_SIZE >
849
+ impl < T , const BUFFER_SIZE : usize > embedded_io_async:: ErrorType
850
+ for AsyncConnectedSession < T , BUFFER_SIZE >
853
851
where
854
852
T : embedded_io_async:: Read + embedded_io_async:: Write ,
855
853
{
856
854
type Error = TlsError ;
857
855
}
858
856
859
- impl < ' a , T , const BUFFER_SIZE : usize > embedded_io_async:: Read
860
- for AsyncConnectedSession < ' a , T , BUFFER_SIZE >
857
+ impl < T , const BUFFER_SIZE : usize > embedded_io_async:: Read for AsyncConnectedSession < T , BUFFER_SIZE >
861
858
where
862
859
T : embedded_io_async:: Read + embedded_io_async:: Write ,
863
860
{
@@ -879,8 +876,7 @@ pub mod asynch {
879
876
}
880
877
}
881
878
882
- impl < ' a , T , const BUFFER_SIZE : usize > embedded_io_async:: Write
883
- for AsyncConnectedSession < ' a , T , BUFFER_SIZE >
879
+ impl < T , const BUFFER_SIZE : usize > embedded_io_async:: Write for AsyncConnectedSession < T , BUFFER_SIZE >
884
880
where
885
881
T : embedded_io_async:: Read + embedded_io_async:: Write ,
886
882
{
0 commit comments