[Git][NTPsec/ntpsec][master] 5 commits: Updated new features documentation re: ntpq & root distance.

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
53cf63d1 by Ian Bruene at 2018-01-25T21:38:47Z
Updated new features documentation re: ntpq & root distance.

- - - - -
22740f1f by Ian Bruene at 2018-01-25T21:39:25Z
Merge branch 'fiddler'

- - - - -
5c09fb70 by Eric S. Raymond at 2018-01-25T23:11:37Z
Fill in sys_rootdist even if we have to combine peers.

- - - - -
108a6fdf by Stephen Walker at 2018-04-08T23:07:47Z
Merge branch 'master' of gitlab.com:sdwalker/ntpsec

- - - - -
861012e3 by Stephen Walker at 2018-04-08T23:13:57Z
attic: build on OpenSSL without Camellia

Signed-off-by: Stephen Walker <stephendwalker+github at gmail.com>

- - - - -


1 changed file:

- attic/digest-timing.c


Changes:

=====================================
attic/digest-timing.c
=====================================
--- a/attic/digest-timing.c
+++ b/attic/digest-timing.c
@@ -242,10 +242,12 @@ int main(int argc, char *argv[])
   DoCMAC("AES-128", EVP_aes_128_cbc(),      key, 16, packet, PACKET_LENGTH);
   DoCMAC("AES-192", EVP_aes_192_cbc(),      key, 24, packet, PACKET_LENGTH);
   DoCMAC("AES-256", EVP_aes_256_cbc(),      key, 32, packet, PACKET_LENGTH);
+#ifndef OPENSSL_NO_CAMELLIA
   DoCMAC("CAM-128", EVP_camellia_128_cbc(), key, 16, packet, PACKET_LENGTH);
   DoCMAC("CAM-192", EVP_camellia_192_cbc(), key, 24, packet, PACKET_LENGTH);
   DoCMAC("CAM-256", EVP_camellia_256_cbc(), key, 32, packet, PACKET_LENGTH);
 #endif
+#endif
 
   return 0;
   



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/390de4920bdf255cb1a57507155c25f97302eb3c...861012e34b983bdaf2ec1c9567862669cd67d503

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/390de4920bdf255cb1a57507155c25f97302eb3c...861012e34b983bdaf2ec1c9567862669cd67d503
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20180409/444d5b48/attachment.html>