diff --git a/Makefile.am b/Makefile.am index 1cbaf988..8f7722cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,7 +55,6 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h linux/kdbus.h \ src/kdbus.h src/kdbus.c \ src/netdev.h src/netdev.c \ src/wiphy.h src/wiphy.c \ - src/sha1.h src/sha1.c \ src/ie.h src/ie.c \ src/dbus.h src/dbus.c \ src/manager.h src/manager.c \ @@ -86,7 +85,6 @@ monitor_iwmon_SOURCES = monitor/main.c linux/nl80211.h \ src/wscutil.h src/wscutil.c \ src/mpdu.h src/mpdu.c \ src/util.h src/util.c \ - src/sha1.h src/sha1.c \ src/crypto.h src/crypto.c \ src/eapol.h src/eapol.c \ src/eap.h src/eap.c \ @@ -114,29 +112,24 @@ noinst_DATA = ell/unit/test_data endif unit_test_cmac_aes_SOURCES = unit/test-cmac-aes.c \ - src/sha1.h src/sha1.c \ src/crypto.h src/crypto.c unit_test_cmac_aes_LDADD = ell/libell-internal.la unit_test_arc4_SOURCES = unit/test-arc4.c \ - src/sha1.h src/sha1.c \ src/crypto.h src/crypto.c unit_test_arc4_LDADD = ell/libell-internal.la unit_test_hmac_md5_SOURCES = unit/test-hmac-md5.c \ - src/sha1.h src/sha1.c \ src/crypto.h src/crypto.c unit_test_hmac_md5_LDADD = ell/libell-internal.la unit_test_hmac_sha1_SOURCES = unit/test-hmac-sha1.c \ - src/crypto.h src/crypto.c \ - src/sha1.h src/sha1.c + src/crypto.h src/crypto.c unit_test_hmac_sha1_LDADD = ell/libell-internal.la unit_test_hmac_sha256_SOURCES = unit/test-hmac-sha256.c \ - src/crypto.h src/crypto.c \ - src/sha1.h src/sha1.c + src/crypto.h src/crypto.c unit_test_hmac_sha256_LDADD = ell/libell-internal.la unit_test_pbkdf2_sha1_SOURCES = unit/test-pbkdf2-sha1.c \ @@ -144,15 +137,13 @@ unit_test_pbkdf2_sha1_SOURCES = unit/test-pbkdf2-sha1.c \ unit_test_pbkdf2_sha1_LDADD = ell/libell-internal.la unit_test_prf_sha1_SOURCES = unit/test-prf-sha1.c \ - src/crypto.h src/crypto.c \ - src/sha1.h src/sha1.c + src/crypto.h src/crypto.c unit_test_prf_sha1_LDADD = ell/libell-internal.la unit_test_ie_SOURCES = unit/test-ie.c src/ie.h src/ie.c unit_test_ie_LDADD = ell/libell-internal.la unit_test_crypto_SOURCES = unit/test-crypto.c \ - src/sha1.h src/sha1.c \ src/crypto.h src/crypto.c unit_test_crypto_LDADD = ell/libell-internal.la @@ -161,7 +152,6 @@ unit_test_mpdu_SOURCES = unit/test-mpdu.c \ unit_test_mpdu_LDADD = ell/libell-internal.la unit_test_eapol_SOURCES = unit/test-eapol.c \ - src/sha1.h src/sha1.c \ src/crypto.h src/crypto.c \ src/ie.h src/ie.c \ src/eapol.h src/eapol.c \ diff --git a/src/crypto.c b/src/crypto.c index 7efb5ae5..164a7783 100644 --- a/src/crypto.c +++ b/src/crypto.c @@ -31,7 +31,6 @@ #include -#include "sha1.h" #include "crypto.h" static bool hmac_common(enum l_checksum_type type, diff --git a/src/eapol.c b/src/eapol.c index b8d885b3..76fb866d 100644 --- a/src/eapol.c +++ b/src/eapol.c @@ -34,7 +34,6 @@ #include #include -#include "sha1.h" #include "crypto.h" #include "eapol.h" #include "ie.h" diff --git a/src/sha1.c b/src/sha1.c deleted file mode 100644 index a807af5f..00000000 --- a/src/sha1.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * - * Wireless daemon for Linux - * - * Copyright (C) 2013-2014 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - diff --git a/src/sha1.h b/src/sha1.h deleted file mode 100644 index 8b608cbd..00000000 --- a/src/sha1.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Wireless daemon for Linux - * - * Copyright (C) 2013-2014 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include -