@@ -23,7 +23,6 @@ use libc::{
23
23
c_char,
24
24
c_uint,
25
25
size_t,
26
- time_t,
27
26
} ;
28
27
29
28
use chrono:: LocalResult ;
@@ -582,7 +581,7 @@ impl<'a> DecryptionHelper for &mut Helper<'a> {
582
581
}
583
582
let testy = & keyid. to_hex ( ) ;
584
583
trace ! ( "Keystore::cert_find_ for {:?}" , testy) ;
585
-
584
+
586
585
trace ! ( "Considering PKESK for {}" , keyid) ;
587
586
588
587
// Collect the recipients. Note: we must return the
@@ -768,7 +767,7 @@ ffi!(fn pgp_get_key_ids(session: *mut Session,
768
767
-> Result <( ) >
769
768
{
770
769
let session = Session :: as_mut( session) ?;
771
-
770
+
772
771
let mm = session. mm( ) ;
773
772
774
773
let message: & [ u8 ] = unsafe { check_slice!( ctext, csize) } ;
@@ -1260,10 +1259,10 @@ ffi!(fn pgp_encrypt_and_sign(session: *mut Session,
1260
1259
session, keylist, ptext, psize, ctextp, csizep, true )
1261
1260
} ) ;
1262
1261
1263
- // PEP_STATUS _pgp_generate_keypair(PEP_SESSION session, pEp_identity *identity, time_t when)
1262
+ // PEP_STATUS _pgp_generate_keypair(PEP_SESSION session, pEp_identity *identity, i64 when)
1264
1263
ffi ! ( fn _pgp_generate_keypair( session: * mut Session ,
1265
1264
identity: * mut PepIdentity ,
1266
- when: time_t )
1265
+ when: i64 )
1267
1266
-> Result <( ) >
1268
1267
{
1269
1268
let session = Session :: as_mut( session) ?;
@@ -2078,10 +2077,10 @@ fn _pgp_key_expired(vc: &ValidCert) -> bool
2078
2077
}
2079
2078
2080
2079
// PEP_STATUS pgp_key_expired(PEP_SESSION session, const char *fpr,
2081
- // const time_t when, bool *expired)
2080
+ // const i64 when, bool *expired)
2082
2081
ffi ! ( fn pgp_key_expired( session: * mut Session ,
2083
2082
fpr: * const c_char,
2084
- when: time_t ,
2083
+ when: i64 ,
2085
2084
expiredp: * mut bool )
2086
2085
-> Result <( ) >
2087
2086
{
@@ -2299,10 +2298,10 @@ ffi!(fn pgp_get_key_rating(session: *mut Session, fpr: *const c_char,
2299
2298
Ok ( ( ) )
2300
2299
} ) ;
2301
2300
2302
- // PEP_STATUS pgp_key_created(PEP_SESSION session, const char *fpr, time_t *created)
2301
+ // PEP_STATUS pgp_key_created(PEP_SESSION session, const char *fpr, i64 *created)
2303
2302
ffi ! ( fn pgp_key_created( session: * mut Session ,
2304
2303
fpr: * const c_char,
2305
- createdp: * mut time_t )
2304
+ createdp: * mut i64 )
2306
2305
-> Result <( ) >
2307
2306
{
2308
2307
let session = Session :: as_mut( session) ?;
@@ -2317,7 +2316,7 @@ ffi!(fn pgp_key_created(session: *mut Session,
2317
2316
UnknownError ,
2318
2317
"Creation time out of range" ) ?. as_secs( ) ;
2319
2318
2320
- * createdp = t as time_t ;
2319
+ * createdp = t as i64 ;
2321
2320
2322
2321
Ok ( ( ) )
2323
2322
} ) ;
@@ -2496,28 +2495,28 @@ ZOeYHUIgxtJmOOp8ty/EfgEbx2QAAMDtAQC5fuVHyLfl1SqncTZaZkdaoSEqHdZA
2496
2495
// Version: 3
2497
2496
// Recipient: 003F542BE1540CD4
2498
2497
// Pk algo: ECDH
2499
- //
2498
+ //
2500
2499
// Sym. Encrypted and Integrity Protected Data Packet, new CTB, 300 bytes
2501
2500
// │ Version: 1
2502
2501
// │ Session key: 09B40F05C8F12C7FF6F409698E2358C221654CDC7E300872686FEF1E16EF2385
2503
2502
// │ Symmetric algo: AES-256
2504
2503
// │ Decryption successful
2505
- // │
2504
+ // │
2506
2505
// ├── Compressed Data Packet, new CTB, 256 bytes
2507
2506
// │ │ Algorithm: ZIP
2508
- // │ │
2507
+ // │ │
2509
2508
// │ ├── One-Pass Signature Packet, new CTB, 13 bytes
2510
2509
// │ │ Version: 3
2511
2510
// │ │ Type: Binary
2512
2511
// │ │ Pk algo: EdDSA
2513
2512
// │ │ Hash algo: SHA512
2514
2513
// │ │ Issuer: D96F49BEF7FEB210
2515
2514
// │ │ Last: true
2516
- // │ │
2515
+ // │ │
2517
2516
// │ ├── Literal Data Packet, new CTB, 14 bytes
2518
2517
// │ │ Format: Binary data
2519
2518
// │ │ Content: "hi, pep\n"
2520
- // │ │
2519
+ // │ │
2521
2520
// │ └── Signature Packet, new CTB, 212 bytes
2522
2521
// │ Version: 4
2523
2522
// │ Type: Binary
@@ -2533,7 +2532,7 @@ ZOeYHUIgxtJmOOp8ty/EfgEbx2QAAMDtAQC5fuVHyLfl1SqncTZaZkdaoSEqHdZA
2533
2532
// │ Intended Recipient: 64E7981D4220C6D26638EA7CB72FC47E011BC764
2534
2533
// │ Digest prefix: 843B
2535
2534
// │ Level: 0 (signature over data)
2536
- // │
2535
+ // │
2537
2536
// └── Modification Detection Code Packet, new CTB, 20 bytes
2538
2537
// Digest: 430056320490BE00DD9695E9DA5964207E54844B
2539
2538
// Computed digest: 430056320490BE00DD9695E9DA5964207E54844B
@@ -2896,7 +2895,7 @@ l/Z6+iUK0OopAbQ=
2896
2895
2897
2896
// let ptext = unsafe { check_slice!(plaintext, plaintext_len) };
2898
2897
// let s = String::from_utf8_lossy(ptext);
2899
-
2898
+
2900
2899
// println!("well: {} then", s);
2901
2900
//assert_eq!(ptext, MSG.as_bytes());
2902
2901
0 commit comments