+#include "build-config.h"
+
#include "armor.h"
#include "charfuncs.h"
#include "cleankey.h"
@@ -37,7 +38,6 @@
#include "onak-conf.h"
#include "parsekey.h"
#include "photoid.h"
-#include "version.h"
#define OP_UNKNOWN 0
#define OP_GET 1
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
{
char **params = NULL;
int op = OP_UNKNOWN;
- int i;
+ int i, j;
int indx = 0;
bool dispfp = false;
bool skshash = false;
@@ -147,12 +147,24 @@ int main(int argc, char *argv[])
params[i+1] = NULL;
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++) {
- fingerprint.fp[i] = (hex2bin(
- search[2 + i * 2])
+ /* v4 fingerprint */
+ fingerprint.length = 20;
+ for (j = 0; j < 20; j++) {
+ fingerprint.fp[j] = (hex2bin(
+ search[2 + j * 2])
+ << 4) +
+ hex2bin(search[3 + j * 2]);
+ }
+ isfp = true;
+ } else if (search != NULL && strlen(search) == 66 &&
+ search[0] == '0' && search[1] == 'x') {
+ /* v5 fingerprint */
+ fingerprint.length = 32;
+ for (j = 0; j < 32; j++) {
+ fingerprint.fp[j] = (hex2bin(
+ search[2 + j * 2])
<< 4) +
- hex2bin(search[3 + i * 2]);
+ hex2bin(search[3 + j * 2]);
}
isfp = true;
} else if (search != NULL) {
@@ -215,7 +227,7 @@ int main(int argc, char *argv[])
readconfig(NULL);
initlogthing("lookup", config.logfile);
catchsignals();
- dbctx = config.dbinit(false);
+ dbctx = config.dbinit(config.backend, false);
switch (op) {
case OP_GET:
case OP_HGET:
@@ -240,7 +252,7 @@ int main(int argc, char *argv[])
result,
search);
puts("");
- cleankeys(publickey);
+ cleankeys(&publickey, config.clean_policies);
flatten_publickey(publickey,
&packets,
&list_end);