Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/util.c
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2016-09-25 19:10:03 +1000
committerAllan McRae <allan@archlinux.org>2016-10-10 10:37:21 +1000
commit05e1b8de1a96526c4e59745e7e4dc4a83a6383dd (patch)
tree562af4c78b9a17f757db811fbdd2d4b4bd071e5f /lib/libalpm/util.c
parent0d2ba870c96d1b4b3d5fabfabe303bc6b1c989fd (diff)
Remove internal md5 and sha2 implementations
The internal implementations for md5 and sha256 checksums have not been merged from upstream sources for a long time. Instead of us carrying copies of code from other projects, we should just support building against multiple libraries that provide such functionality. This patch removes the md5 and sha2 code (originally obtained from PolarSSL) from our repository. The configure script will now error unless at least one library supporting checksum generation is present, with the only library currently supported being openssl. It will be relatively simple for other such libraries (e.g. nettle) to be supported if anyone wishes to add them. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/util.c')
-rw-r--r--lib/libalpm/util.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 1e554632..3b7c3bc9 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -40,9 +40,6 @@
#ifdef HAVE_LIBSSL
#include <openssl/md5.h>
#include <openssl/sha.h>
-#else
-#include "md5.h"
-#include "sha2.h"
#endif
/* libalpm */
@@ -990,7 +987,6 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename)
ASSERT(filename != NULL, return NULL);
- /* defined above for OpenSSL, otherwise defined in md5.h */
if(md5_file(filename, output) > 0) {
return NULL;
}
@@ -1009,7 +1005,6 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename)
ASSERT(filename != NULL, return NULL);
- /* defined above for OpenSSL, otherwise defined in sha2.h */
if(sha2_file(filename, output, 0) > 0) {
return NULL;
}