lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove monotonic clock (#133)

Browse source
This commit is contained in:
wussler 2021-06-16 14:06:07 +02:00 • committed by GitHub
parent 0e109ca7ce
commit 039f757e93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crypto/time.go
View file

@ -1,7 +1,6 @@
package crypto
import (
"errors"
"time"
)
@ -30,24 +29,13 @@ func GetTime() time.Time {
// ----- INTERNAL FUNCTIONS -----
// getNow returns current time.
// getNow returns the latest server time.
func getNow() time.Time {
extrapolate, err := getDiff()
if err != nil {
if pgp.latestServerTime == 0 {
return time.Now()
}
return time.Unix(pgp.latestServerTime+extrapolate, 0)
}
func getDiff() (int64, error) {
if pgp.latestServerTime > 0 && !pgp.latestClientTime.IsZero() {
// Since is monotonic, it uses a monotonic clock in this case instead of the wall clock
return int64(time.Since(pgp.latestClientTime).Seconds()), nil
}
return 0, errors.New("gopenpgp: latest server time not available")
return time.Unix(pgp.latestServerTime, 0)
}
// getTimeGenerator Returns a time generator function.
@ -57,13 +45,11 @@ func getTimeGenerator() func() time.Time {
// getNowKeyGenerationOffset returns the current time with the key generation offset.
func getNowKeyGenerationOffset() time.Time {
extrapolate, err := getDiff()
if err != nil {
if pgp.latestServerTime == 0 {
return time.Unix(time.Now().Unix()+pgp.generationOffset, 0)
}
return time.Unix(pgp.latestServerTime+extrapolate+pgp.generationOffset, 0)
return time.Unix(pgp.latestServerTime+pgp.generationOffset, 0)
}
// getKeyGenerationTimeGenerator Returns a time generator function with the key generation offset.