From cfd84663b9d1dc336ead8369e97f2e61f5902d90 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 20 Jan 2013 16:04:43 -0800 Subject: [PATCH] A library should expose its version --- src/libsodium/Makefile.am | 3 ++- src/libsodium/include/sodium/version.h.in | 14 +++++++++----- src/libsodium/version.c | 20 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 src/libsodium/version.c diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index b9433591..73158820 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -73,7 +73,8 @@ libsodium_la_SOURCES = \ crypto_sign/ed25519/ref/ge25519.h \ crypto_sign/ed25519/ref/ge25519_ed25519.c \ crypto_sign/ed25519/ref/sc25519.h \ - crypto_sign/ed25519/ref/sc25519_ed25519.c + crypto_sign/ed25519/ref/sc25519_ed25519.c \ + version.c libsodium_la_LDFLAGS = \ $(AM_LDFLAGS) \ diff --git a/src/libsodium/include/sodium/version.h.in b/src/libsodium/include/sodium/version.h.in index c6843a06..9cf7d367 100644 --- a/src/libsodium/include/sodium/version.h.in +++ b/src/libsodium/include/sodium/version.h.in @@ -1,10 +1,14 @@ -#ifndef __NACL_VERSION_H__ -#define __NACL_VERSION_H__ +#ifndef __SODIUM_VERSION_H__ +#define __SODIUM_VERSION_H__ -#define NACL_VERSION_STRING "@VERSION@" +#define SODIUM_VERSION_STRING "@VERSION@" -#define NACL_VERSION_MAJOR 0 -#define NACL_VERSION_MINOR 1 +#define SODIUM_VERSION_MAJOR 0 +#define SODIUM_VERSION_MINOR 1 + +const char *sodium_version_string(void); +const int sodium_version_major(void); +const int sodium_version_minor(void); #endif diff --git a/src/libsodium/version.c b/src/libsodium/version.c new file mode 100644 index 00000000..bff05ff2 --- /dev/null +++ b/src/libsodium/version.c @@ -0,0 +1,20 @@ + +#include "version.h" + +const char * +sodium_version_string(void) +{ + return SODIUM_VERSION_STRING; +} + +const int +sodium_version_major(void) +{ + return SODIUM_VERSION_MAJOR; +} + +const int +sodium_version_minor(void) +{ + return SODIUM_VERSION_MINOR; +}