The time for 32-bit key IDs is long past (and even 64-bits are risky),
so switch to 64-bit IDs everywhere we display a key ID.
"\">Find reverse path</A>\n",
to,
from);
"\">Find reverse path</A>\n",
to,
from);
- printf("<A HREF=\"gpgwww?from=0x%08" PRIX64 "&to=0x%08" PRIX64
+ printf("<A HREF=\"gpgwww?from=0x%016" PRIX64 "&to=0x%016" PRIX64
"&op=get\">"
"Get all keys listed</A></P>\n",
from,
"&op=get\">"
"Get all keys listed</A></P>\n",
from,
}
if (html && uid != NULL) {
printf("%s <a href=\"lookup?op=get&"
}
if (html && uid != NULL) {
printf("%s <a href=\"lookup?op=get&"
- "search=0x%016" PRIX64 "\">%08" PRIX64
+ "search=0x%016" PRIX64 "\">0x%016" PRIX64
"</a> "
"<a href=\"lookup?op=vindex&search=0x%016"
PRIX64 "\">%s</a>\n",
sig,
sigid,
"</a> "
"<a href=\"lookup?op=vindex&search=0x%016"
PRIX64 "\">%s</a>\n",
sig,
sigid,
sigid,
txt2html(uid));
} else if (html && uid == NULL) {
sigid,
txt2html(uid));
} else if (html && uid == NULL) {
- printf("%s %08" PRIX64 " "
+ printf("%s 0x%016" PRIX64 " "
"[User id not found]\n",
sig,
"[User id not found]\n",
sig,
+ printf("%s 0x%016" PRIX64
(uid != NULL) ? uid :
"[User id not found]");
}
(uid != NULL) ? uid :
"[User id not found]");
}
&keyid) != ONAK_E_OK) {
logthing(LOGTHING_ERROR, "Couldn't get keyid.");
}
&keyid) != ONAK_E_OK) {
logthing(LOGTHING_ERROR, "Couldn't get keyid.");
}
- printf("sub %5d%c/%08X %04d/%02d/%02d\n",
+ printf("sub %5d%c/0x%016" PRIX64 " %04d/%02d/%02d\n",
length,
pkalgo2char(type),
length,
pkalgo2char(type),
- (uint32_t) (keyid & 0xFFFFFFFF),
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
if (html) {
printf("pub %5d%c/<a href=\"lookup?op=get&"
if (html) {
printf("pub %5d%c/<a href=\"lookup?op=get&"
- "search=0x%016" PRIX64 "\">%08" PRIX64
+ "search=0x%016" PRIX64 "\">0x%016" PRIX64
"</a> %04d/%02d/%02d ",
length,
pkalgo2char(type),
keyid,
"</a> %04d/%02d/%02d ",
length,
pkalgo2char(type),
keyid,
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
} else {
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
} else {
- printf("pub %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
+ printf("pub %5d%c/0x%016" PRIX64 " %04d/%02d/%02d ",
length,
pkalgo2char(type),
length,
pkalgo2char(type),
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
html ? "<BR>" : "");
if (keyinfoa->colour == 0) {
if (pathnum == 0) {
html ? "<BR>" : "");
if (keyinfoa->colour == 0) {
if (pathnum == 0) {
- printf("Can't find a link from 0x%08" PRIX64
- " to 0x%08" PRIX64 "%s\n",
+ printf("Can't find a link from 0x%016" PRIX64
+ " to 0x%016" PRIX64 "%s\n",
have,
want,
html ? "<BR>" : "");
have,
want,
html ? "<BR>" : "");
}
pathnum = count;
} else {
}
pathnum = count;
} else {
- printf("%d steps from 0x%08" PRIX64 " to 0x%08" PRIX64
- "%s\n",
- keyinfoa->colour, have & 0xFFFFFFFF,
- want & 0xFFFFFFFF,
+ printf("%d steps from 0x%016" PRIX64 " to 0x%016"
+ PRIX64 "%s\n",
+ keyinfoa->colour, have,
+ want,
html ? "<BR>" : "");
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
html ? "<BR>" : "");
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
curkey->keyid);
if (html && uid == NULL) {
printf("<a href=\"lookup?op=get&search="
curkey->keyid);
if (html && uid == NULL) {
printf("<a href=\"lookup?op=get&search="
- "0x%08" PRIX64 "\">0x%08" PRIX64
- "</a> (["
+ "0x%016" PRIX64 "\">0x%016"
+ PRIX64 "</a> (["
"User id not found])%s<BR>\n",
"User id not found])%s<BR>\n",
- curkey->keyid & 0xFFFFFFFF,
- curkey->keyid & 0xFFFFFFFF,
+ curkey->keyid,
+ curkey->keyid,
(curkey->keyid == fullwant) ?
"" : " signs");
} else if (html && uid != NULL) {
printf("<a href=\"lookup?op=get&search="
(curkey->keyid == fullwant) ?
"" : " signs");
} else if (html && uid != NULL) {
printf("<a href=\"lookup?op=get&search="
- "0x%08" PRIX64 "\">0x%08"
+ "0x%016" PRIX64 "\">0x%016"
PRIX64 "</a>"
" (<a href=\"lookup?op=vindex&"
PRIX64 "</a>"
" (<a href=\"lookup?op=vindex&"
- curkey->keyid & 0xFFFFFFFF,
- curkey->keyid & 0xFFFFFFFF,
- curkey->keyid & 0xFFFFFFFF,
+ curkey->keyid,
+ curkey->keyid,
+ curkey->keyid,
txt2html(uid),
(curkey->keyid == fullwant) ?
"" : " signs");
} else {
txt2html(uid),
(curkey->keyid == fullwant) ?
"" : " signs");
} else {
- printf("0x%08" PRIX64 " (%s)%s\n",
- curkey->keyid & 0xFFFFFFFF,
+ printf("0x%016" PRIX64 " (%s)%s\n",
+ curkey->keyid,
(uid == NULL) ?
"[User id not found]" :
uid,
(uid == NULL) ?
"[User id not found]" :
uid,
}
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
}
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
- printf("0x%08" PRIX64 " ",
- curkey->keyid & 0xFFFFFFFF);
+ printf("0x%016" PRIX64 " ",
+ curkey->keyid);
curkey = findinhash(curkey->parent);
}
putchar('\n');
curkey = findinhash(curkey->parent);
}
putchar('\n');
cd ${WORKDIR}
${BUILDDIR}/onak -b -c $1 add < ${TESTSDIR}/../keys/noodles.key
if ! ${BUILDDIR}/onak -c $1 index noodles 2> /dev/null | \
cd ${WORKDIR}
${BUILDDIR}/onak -b -c $1 add < ${TESTSDIR}/../keys/noodles.key
if ! ${BUILDDIR}/onak -c $1 index noodles 2> /dev/null | \
- grep -q -- 'pub 4096R/2DA8B985 2008/06/03 Jonathan McDowell'; then
+ grep -q -- 'pub 4096R/0x94FA372B2DA8B985 2008/06/03 Jonathan McDowell'; then
echo "* Did not correctly retrieve key by text"
exit 1
fi
echo "* Did not correctly retrieve key by text"
exit 1
fi
${BUILDDIR}/onak -b -c $1 add < ${TESTSDIR}/../keys/v5-test.key
if ! ${BUILDDIR}/onak -c $1 index emma 2> /dev/null | \
grep -q -- \
${BUILDDIR}/onak -b -c $1 add < ${TESTSDIR}/../keys/v5-test.key
if ! ${BUILDDIR}/onak -c $1 index emma 2> /dev/null | \
grep -q -- \
- 'pub 255E/87246402 2019/03/20 emma.goldman@example.net'; then
+ 'pub 255E/0x19347BC987246402 2019/03/20 emma.goldman@example.net'; then
echo "* Did not correctly retrieve key by text"
exit 1
fi
echo "* Did not correctly retrieve key by text"
exit 1
fi