Merge branch 'api-opaque' into master-updates

diff --cc ChangeLog
index baf6c13af7fed29de74a104a61b8a212fc6e4502,da614f69bc6b792c89f1afc7f45def3ae8d27346..416c7208e11c020da8b8d23acd57d5808e6855d7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,41 +1,47 @@@
 +2017-10-23  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * examples/Makefile.in (check): Also set DYLD_LIBRARY_PATH in the
 +      environment, to support Mac OSX shared libraries.
 +      * testsuite/Makefile.in (LD_LIBRARY_PATH): Likewise.
 +
+ 2017-10-23  Niels Möller  <nisse@lysator.liu.se>
+ 
+       Merge API fixes, starting at 2017-01-12.
+ 
+ 2017-04-09  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * ecc-curve.h (nettle_get_secp_192r1, nettle_get_secp_224r1)
+       (nettle_get_secp_256r1, nettle_get_secp_384r1)
+       (nettle_get_secp_521r1): New functions, returning a pointer to
+       corresponding structure.
+       (nettle_secp_192r1, nettle_secp_224r1, nettle_secp_256r1)
+       (nettle_secp_384r1, nettle_secp_521r1): Redefined as macros,
+       calling the corresponding function.
+ 
+       * nettle-meta.h (nettle_ciphers, nettle_aeads, nettle_armors): New
+       macros, analogous to below change to nettle_hashes.
+ 
+       * nettle-meta-ciphers.c (nettle_get_ciphers): New function.
+ 
+       * nettle-meta-aeads.c (nettle_get_aeads): New function.
+ 
+       * nettle-meta-armors.c (nettle_get_armors): New function.
+ 
+ 2017-01-12  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * tools/nettle-hash.c (find_algorithm): Deleted function.
+       (main): Replaced by call to nettle_lookup_hash.
+ 
+       * testsuite/meta-hash-test.c (test_main): Use nettle_lookup_hash.
+ 
+       * nettle-meta.h (nettle_hashes): New macro, expanding to a call to
+       nettle_get_hashes. Direct access to the array causes the array
+       size to leak into the ABI, since a plain un-relocatable executable
+       linking with libnettle.so gets copy relocations for any referenced
+       data items in the shared library.
+ 
+       * nettle-meta-hashes.c (nettle_get_hashes): New function.
+ 
  2017-10-16  Niels Möller  <nisse@lysator.liu.se>
  
        CFB support, contributed by Dmitry Eremin-Solenikov.