Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
f1a54f2a
Commit
f1a54f2a
authored
May 12, 2015
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added nettle_version_major and nettle_version_minor functions.
parent
fce23774
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
110 additions
and
1 deletion
+110
-1
ChangeLog
ChangeLog
+9
-0
Makefile.in
Makefile.in
+1
-0
testsuite/.test-rules.make
testsuite/.test-rules.make
+3
-0
testsuite/Makefile.in
testsuite/Makefile.in
+1
-1
testsuite/version-test.c
testsuite/version-test.c
+41
-0
version.c
version.c
+48
-0
version.h.in
version.h.in
+7
-0
No files found.
ChangeLog
View file @
f1a54f2a
2015-05-12 Niels Möller <nisse@lysator.liu.se>
* version.c (nettle_version_major, nettle_version_minor): New
file. New functions, returning the value of the corresponding
preprocessor constant.
* Makefile.in (nettle_SOURCES): Added version.c.
* testsuite/version-test.c: New testcase.
* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added version-test.c.
2015-04-29 Niels Möller <nisse@lysator.liu.se>
* arm/v6/sha256-compress.asm: Fix syntax error in offset
...
...
Makefile.in
View file @
f1a54f2a
...
...
@@ -133,6 +133,7 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
umac-nh.c umac-nh-n.c umac-l2.c umac-l3.c
\
umac-poly64.c umac-poly128.c umac-set-key.c
\
umac32.c umac64.c umac96.c umac128.c
\
version.c
\
write-be32.c write-le32.c write-le64.c
\
yarrow256.c yarrow_key_event.c
...
...
testsuite/.test-rules.make
View file @
f1a54f2a
...
...
@@ -100,6 +100,9 @@ serpent-test$(EXEEXT): serpent-test.$(OBJEXT)
twofish-test$(EXEEXT)
:
twofish-test.$(OBJEXT)
$(LINK)
twofish-test.
$(OBJEXT)
$(TEST_OBJS)
-o
twofish-test
$(EXEEXT)
version-test$(EXEEXT)
:
version-test.$(OBJEXT)
$(LINK)
version-test.
$(OBJEXT)
$(TEST_OBJS)
-o
version-test
$(EXEEXT)
knuth-lfib-test$(EXEEXT)
:
knuth-lfib-test.$(OBJEXT)
$(LINK)
knuth-lfib-test.
$(OBJEXT)
$(TEST_OBJS)
-o
knuth-lfib-test
$(EXEEXT)
...
...
testsuite/Makefile.in
View file @
f1a54f2a
...
...
@@ -23,7 +23,7 @@ TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \
sha384-test.c sha512-test.c sha512-224-test.c sha512-256-test.c
\
sha3-permute-test.c sha3-224-test.c sha3-256-test.c
\
sha3-384-test.c sha3-512-test.c
\
serpent-test.c twofish-test.c
\
serpent-test.c twofish-test.c
version-test.c
\
knuth-lfib-test.c
\
cbc-test.c ctr-test.c gcm-test.c eax-test.c ccm-test.c
\
poly1305-test.c chacha-poly1305-test.c
\
...
...
testsuite/version-test.c
0 → 100644
View file @
f1a54f2a
/* version-test.c
Copyright (C) 2015 Niels Möller
This file is part of GNU Nettle.
GNU Nettle is free software: you can redistribute it and/or
modify it under the terms of either:
* the GNU Lesser General Public License as published by the Free
Software Foundation; either version 3 of the License, or (at your
option) any later version.
or
* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
option) any later version.
or both in parallel, as here.
GNU Nettle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received copies of the GNU General Public License and
the GNU Lesser General Public License along with this program. If
not, see http://www.gnu.org/licenses/.
*/
#include "testutils.h"
void
test_main
(
void
)
{
/* This also checks that we don't by accident link with a different
version of nettle which is installed on the system. */
ASSERT
(
nettle_version_major
()
==
NETTLE_VERSION_MAJOR
);
ASSERT
(
nettle_version_minor
()
==
NETTLE_VERSION_MINOR
);
}
version.c
0 → 100644
View file @
f1a54f2a
/* version.c
Copyright (C) 2015 Niels Möller
This file is part of GNU Nettle.
GNU Nettle is free software: you can redistribute it and/or
modify it under the terms of either:
* the GNU Lesser General Public License as published by the Free
Software Foundation; either version 3 of the License, or (at your
option) any later version.
or
* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
option) any later version.
or both in parallel, as here.
GNU Nettle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received copies of the GNU General Public License and
the GNU Lesser General Public License along with this program. If
not, see http://www.gnu.org/licenses/.
*/
#if HAVE_CONFIG_H
# include "config.h"
#endif
#include "version.h"
int
nettle_version_major
(
void
)
{
return
NETTLE_VERSION_MAJOR
;
}
int
nettle_version_minor
(
void
)
{
return
NETTLE_VERSION_MINOR
;
}
version.h.in
View file @
f1a54f2a
...
...
@@ -3,6 +3,7 @@
Information about library version.
Copyright (C) 2015 Red Hat, Inc.
Copyright (C) 2015 Niels Möller
This file is part of GNU Nettle.
...
...
@@ -50,6 +51,12 @@ extern "C" {
# define GMP_NUMB_BITS @GMP_NUMB_BITS@
#endif
int
nettle_version_major (void);
int
nettle_version_minor (void);
#ifdef __cplusplus
}
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment