X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=b7cfc80205a55e89184f738f12332267f2701f41;hb=85187675424f3854869f1607afd8a1e84e536946;hp=17625baf59eed00909e2d39849e1f3aa20d50ebd;hpb=bf490f1ab8d9e6ccfdaf94814c8e6987994a7cf2;p=onak.git

diff --git a/onak.c b/onak.c
index 17625ba..b7cfc80 100644
--- a/onak.c
+++ b/onak.c
@@ -15,8 +15,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <fcntl.h>
@@ -28,6 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "build-config.h"
+
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"
@@ -42,7 +43,6 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "photoid.h"
-#include "version.h"
 
 void find_keys(struct onak_dbctx *dbctx,
 		char *search, uint64_t keyid,
@@ -234,7 +234,7 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_INFO, "Finished reading %d keys.",
 					result);
 
-			result = cleankeys(keys);
+			result = cleankeys(&keys, config.clean_policies);
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					result);
 
@@ -289,7 +289,8 @@ int main(int argc, char *argv[])
 					result);
 
 			if (keys != NULL) {
-				result = cleankeys(keys);
+				result = cleankeys(&keys,
+						config.clean_policies);
 				logthing(LOGTHING_INFO, "%d keys cleaned.",
 						result);
 
@@ -329,8 +330,19 @@ int main(int argc, char *argv[])
 		search = argv[optind+1];
 		if (search != NULL && strlen(search) == 42 &&
 				search[0] == '0' && search[1] == 'x') {
-			fingerprint.length = MAX_FINGERPRINT_LEN;
-			for (i = 0; i < MAX_FINGERPRINT_LEN; i++) {
+			/* v4 fingerprint */
+			fingerprint.length = 20;
+			for (i = 0; i < 20; i++) {
+				fingerprint.fp[i] =
+					(hex2bin(search[2 + i * 2]) << 4) +
+						hex2bin(search[3 + i * 2]);
+			}
+			isfp = true;
+		} else if (search != NULL && strlen(search) == 66 &&
+				search[0] == '0' && search[1] == 'x') {
+			/* v5 fingerprint */
+			fingerprint.length = 32;
+			for (i = 0; i < 32; i++) {
 				fingerprint.fp[i] =
 					(hex2bin(search[2 + i * 2]) << 4) +
 						hex2bin(search[3 + i * 2]);
@@ -437,7 +449,7 @@ int main(int argc, char *argv[])
 			dbctx->starttrans(dbctx);
 			if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
 				dbctx->delete_key(dbctx, keyid, true);
-				cleankeys(keys);
+				cleankeys(&keys, config.clean_policies);
 				dbctx->store_key(dbctx, keys, true, false);
 			} else {
 				puts("Key not found");