X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=sidebyside;f=keyindex.c;h=94f52f7e25c705d3644da6545c997092f529be3a;hb=85187675424f3854869f1607afd8a1e84e536946;hp=eee2e8a6f867415c3651c5c5d57f0b00424d00ae;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git
diff --git a/keyindex.c b/keyindex.c
index eee2e8a..94f52f7 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -13,8 +13,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 .
*/
#include
@@ -26,16 +25,196 @@
#include "decodekey.h"
#include "getcgi.h"
-#include "hash.h"
#include "keydb.h"
#include "keyid.h"
#include "keyindex.h"
#include "keystructs.h"
#include "log.h"
-#include "onak-conf.h"
+#include "onak.h"
#include "openpgp.h"
-int list_sigs(struct openpgp_packet_list *sigs, bool html)
+/*
+ * Convert a Public Key algorithm to its single character representation.
+ */
+char pkalgo2char(uint8_t algo)
+{
+ char typech;
+
+ switch (algo) {
+ case OPENPGP_PKALGO_DSA:
+ typech = 'D';
+ break;
+ case OPENPGP_PKALGO_ECDSA:
+ case OPENPGP_PKALGO_EDDSA:
+ typech = 'E';
+ break;
+ case OPENPGP_PKALGO_EC:
+ typech = 'e';
+ break;
+ case OPENPGP_PKALGO_ELGAMAL_SIGN:
+ typech = 'G';
+ break;
+ case OPENPGP_PKALGO_ELGAMAL_ENC:
+ typech = 'g';
+ break;
+ case OPENPGP_PKALGO_RSA:
+ typech = 'R';
+ break;
+ case OPENPGP_PKALGO_RSA_ENC:
+ typech = 'r';
+ break;
+ case OPENPGP_PKALGO_RSA_SIGN:
+ typech = 's';
+ break;
+ default:
+ typech = '?';
+ break;
+ }
+
+ return typech;
+}
+
+/*
+ * Given a public key/subkey packet return the key length.
+ */
+unsigned int keylength(struct openpgp_packet *keydata)
+{
+ unsigned int length;
+ uint8_t keyofs;
+
+ switch (keydata->data[0]) {
+ case 2:
+ case 3:
+ length = (keydata->data[8] << 8) +
+ keydata->data[9];
+ break;
+ case 4:
+ case 5:
+ /* v5 has an additional 4 bytes of key length data */
+ keyofs = (keydata->data[0] == 4) ? 6 : 10;
+ switch (keydata->data[5]) {
+ case OPENPGP_PKALGO_EC:
+ case OPENPGP_PKALGO_ECDSA:
+ case OPENPGP_PKALGO_EDDSA:
+ /* Elliptic curve key size is based on OID */
+ /* Curve25519 / 1.3.6.1.4.1.3029.1.5.1 */
+ if ((keydata->data[keyofs] == 10) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x06) &&
+ (keydata->data[keyofs + 3] == 0x01) &&
+ (keydata->data[keyofs + 4] == 0x04) &&
+ (keydata->data[keyofs + 5] == 0x01) &&
+ (keydata->data[keyofs + 6] == 0x97) &&
+ (keydata->data[keyofs + 7] == 0x55) &&
+ (keydata->data[keyofs + 8] == 0x01) &&
+ (keydata->data[keyofs + 9] == 0x05) &&
+ (keydata->data[keyofs + 10] == 0x01)) {
+ length = 255;
+ /* Ed25519 / 1.3.6.1.4.1.11591.15.1 */
+ } else if ((keydata->data[keyofs] == 9) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x06) &&
+ (keydata->data[keyofs + 3] == 0x01) &&
+ (keydata->data[keyofs + 4] == 0x04) &&
+ (keydata->data[keyofs + 5] == 0x01) &&
+ (keydata->data[keyofs + 6] == 0xDA) &&
+ (keydata->data[keyofs + 7] == 0x47) &&
+ (keydata->data[keyofs + 8] == 0x0F) &&
+ (keydata->data[keyofs + 9] == 0x01)) {
+ length = 255;
+ /* nistp256 / 1.2.840.10045.3.1.7 */
+ } else if ((keydata->data[keyofs] == 8) &&
+ (keydata->data[keyofs + 1] == 0x2A) &&
+ (keydata->data[keyofs + 2] == 0x86) &&
+ (keydata->data[keyofs + 3] == 0x48) &&
+ (keydata->data[keyofs + 4] == 0xCE) &&
+ (keydata->data[keyofs + 5] == 0x3D) &&
+ (keydata->data[keyofs + 6] == 0x03) &&
+ (keydata->data[keyofs + 7] == 0x01) &&
+ (keydata->data[keyofs + 8] == 0x07)) {
+ length = 256;
+ /* nistp384 / 1.3.132.0.34 */
+ } else if ((keydata->data[keyofs] == 5) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x81) &&
+ (keydata->data[keyofs + 3] == 0x04) &&
+ (keydata->data[keyofs + 4] == 0x00) &&
+ (keydata->data[keyofs + 5] == 0x22)) {
+ length = 384;
+ /* nistp521 / 1.3.132.0.35 */
+ } else if ((keydata->data[keyofs] == 5) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x81) &&
+ (keydata->data[keyofs + 3] == 0x04) &&
+ (keydata->data[keyofs + 4] == 0x00) &&
+ (keydata->data[keyofs + 5] == 0x23)) {
+ length = 521;
+ /* brainpoolP256r1 / 1.3.36.3.3.2.8.1.1.7 */
+ } else if ((keydata->data[keyofs] == 9) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x24) &&
+ (keydata->data[keyofs + 3] == 0x03) &&
+ (keydata->data[keyofs + 4] == 0x03) &&
+ (keydata->data[keyofs + 5] == 0x02) &&
+ (keydata->data[keyofs + 6] == 0x08) &&
+ (keydata->data[keyofs + 7] == 0x01) &&
+ (keydata->data[keyofs + 8] == 0x01) &&
+ (keydata->data[keyofs + 9] == 0x07)) {
+ length = 256;
+ /* brainpoolP384r1 / 1.3.36.3.3.2.8.1.1.11 */
+ } else if ((keydata->data[keyofs] == 9) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x24) &&
+ (keydata->data[keyofs + 3] == 0x03) &&
+ (keydata->data[keyofs + 4] == 0x03) &&
+ (keydata->data[keyofs + 5] == 0x02) &&
+ (keydata->data[keyofs + 6] == 0x08) &&
+ (keydata->data[keyofs + 7] == 0x01) &&
+ (keydata->data[keyofs + 8] == 0x01) &&
+ (keydata->data[keyofs + 9] == 0x0B)) {
+ length = 384;
+ /* brainpoolP512r1 / 1.3.36.3.3.2.8.1.1.13 */
+ } else if ((keydata->data[keyofs] == 9) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x24) &&
+ (keydata->data[keyofs + 3] == 0x03) &&
+ (keydata->data[keyofs + 4] == 0x03) &&
+ (keydata->data[keyofs + 5] == 0x02) &&
+ (keydata->data[keyofs + 6] == 0x08) &&
+ (keydata->data[keyofs + 7] == 0x01) &&
+ (keydata->data[keyofs + 8] == 0x01) &&
+ (keydata->data[keyofs + 9] == 0x0D)) {
+ length = 512;
+ /* secp256k1 / 1.3.132.0.10 */
+ } else if ((keydata->data[keyofs] == 5) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x81) &&
+ (keydata->data[keyofs + 3] == 0x04) &&
+ (keydata->data[keyofs + 4] == 0x00) &&
+ (keydata->data[keyofs + 5] == 0x0A)) {
+ length = 256;
+ } else {
+ logthing(LOGTHING_ERROR,
+ "Unknown elliptic curve size");
+ length = 0;
+ }
+ break;
+ default:
+ length = (keydata->data[keyofs] << 8) +
+ keydata->data[keyofs + 1];
+ }
+ break;
+ default:
+ logthing(LOGTHING_ERROR, "Unknown key version: %d",
+ keydata->data[0]);
+ length = 0;
+ }
+
+ return length;
+}
+
+int list_sigs(struct onak_dbctx *dbctx,
+ struct openpgp_packet_list *sigs, bool html)
{
char *uid = NULL;
uint64_t sigid = 0;
@@ -43,7 +222,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
while (sigs != NULL) {
sigid = sig_keyid(sigs->packet);
- uid = config.dbbackend->keyid2uid(sigid);
+ uid = dbctx->keyid2uid(dbctx, sigid);
if (sigs->packet->data[0] == 4 &&
sigs->packet->data[1] == 0x30) {
/* It's a Type 4 sig revocation */
@@ -53,7 +232,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
}
if (html && uid != NULL) {
printf("%s %08" PRIX64
+ "search=0x%016" PRIX64 "\">%08" PRIX64
" "
"%s\n",
@@ -85,7 +264,8 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
return 0;
}
-int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
+int list_uids(struct onak_dbctx *dbctx,
+ uint64_t keyid, struct openpgp_signedpacket_list *uids,
bool verbose, bool html)
{
char buf[1024];
@@ -112,7 +292,7 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
}
}
if (verbose) {
- list_sigs(uids->sigs, html);
+ list_sigs(dbctx, uids->sigs, html);
}
uids = uids->next;
}
@@ -120,13 +300,15 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
return 0;
}
-int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
+int list_subkeys(struct onak_dbctx *dbctx,
+ struct openpgp_signedpacket_list *subkeys, bool verbose,
bool html)
{
struct tm *created = NULL;
time_t created_time = 0;
int type = 0;
int length = 0;
+ uint64_t keyid = 0;
while (subkeys != NULL) {
if (subkeys->packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
@@ -141,34 +323,33 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
case 2:
case 3:
type = subkeys->packet->data[7];
- length = (subkeys->packet->data[8] << 8) +
- subkeys->packet->data[9];
break;
case 4:
+ case 5:
type = subkeys->packet->data[5];
- length = (subkeys->packet->data[6] << 8) +
- subkeys->packet->data[7];
break;
default:
logthing(LOGTHING_ERROR,
- "Unknown key type: %d",
+ "Unknown key version: %d",
subkeys->packet->data[0]);
}
-
+ length = keylength(subkeys->packet);
+
+ if (get_packetid(subkeys->packet,
+ &keyid) != ONAK_E_OK) {
+ logthing(LOGTHING_ERROR, "Couldn't get keyid.");
+ }
printf("sub %5d%c/%08X %04d/%02d/%02d\n",
length,
- (type == OPENPGP_PKALGO_RSA) ? 'R' :
- ((type == OPENPGP_PKALGO_ELGAMAL) ? 'g' :
- ((type == OPENPGP_PKALGO_DSA) ? 'D' : '?')),
- (uint32_t) (get_packetid(subkeys->packet) &
- 0xFFFFFFFF),
+ pkalgo2char(type),
+ (uint32_t) (keyid & 0xFFFFFFFF),
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
}
if (verbose) {
- list_sigs(subkeys->sigs, html);
+ list_sigs(dbctx, subkeys->sigs, html);
}
subkeys = subkeys->next;
}
@@ -179,20 +360,21 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
void display_fingerprint(struct openpgp_publickey *key)
{
int i = 0;
- size_t length = 0;
- unsigned char fp[20];
+ struct openpgp_fingerprint fingerprint;
- get_fingerprint(key->publickey, fp, &length);
+ get_fingerprint(key->publickey, &fingerprint);
printf(" Key fingerprint =");
- for (i = 0; i < length; i++) {
- if ((length == 16) ||
+ for (i = 0; i < fingerprint.length; i++) {
+ if ((fingerprint.length == 16) ||
(i % 2 == 0)) {
printf(" ");
}
- printf("%02X", fp[i]);
- if ((i * 2) == length) {
+ if (fingerprint.length == 20 &&
+ (i * 2) == fingerprint.length) {
+ /* Extra space in the middle of a SHA1 fingerprint */
printf(" ");
}
+ printf("%02X", fingerprint.fp[i]);
}
printf("\n");
@@ -234,14 +416,14 @@ void display_skshash(struct openpgp_publickey *key, bool html)
* This function takes a list of OpenPGP public keys and displays an index
* of them. Useful for debugging or the keyserver Index function.
*/
-int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
+int key_index(struct onak_dbctx *dbctx,
+ struct openpgp_publickey *keys, bool verbose, bool fingerprint,
bool skshash, bool html)
{
struct openpgp_signedpacket_list *curuid = NULL;
struct tm *created = NULL;
time_t created_time = 0;
int type = 0;
- char typech;
int length = 0;
char buf[1024];
uint64_t keyid;
@@ -261,45 +443,27 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
case 2:
case 3:
type = keys->publickey->data[7];
- length = (keys->publickey->data[8] << 8) +
- keys->publickey->data[9];
break;
case 4:
+ case 5:
type = keys->publickey->data[5];
- length = (keys->publickey->data[6] << 8) +
- keys->publickey->data[7];
break;
default:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
+ logthing(LOGTHING_ERROR, "Unknown key version: %d",
keys->publickey->data[0]);
}
-
- keyid = get_keyid(keys);
+ length = keylength(keys->publickey);
- switch (type) {
- case OPENPGP_PKALGO_RSA:
- typech = 'R';
- break;
- case OPENPGP_PKALGO_ELGAMAL:
- typech = 'g';
- break;
- case OPENPGP_PKALGO_DSA:
- typech = 'D';
- break;
- case OPENPGP_PKALGO_ELGAMAL_SIGN:
- typech = 'G';
- break;
- default:
- typech = '?';
- break;
+ if (get_keyid(keys, &keyid) != ONAK_E_OK) {
+ logthing(LOGTHING_ERROR, "Couldn't get keyid.");
}
if (html) {
printf("pub %5d%c/%08" PRIX64
+ "search=0x%016" PRIX64 "\">%08" PRIX64
" %04d/%02d/%02d ",
length,
- typech,
+ pkalgo2char(type),
keyid,
keyid & 0xFFFFFFFF,
created->tm_year + 1900,
@@ -308,7 +472,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
} else {
printf("pub %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
length,
- typech,
+ pkalgo2char(type),
keyid & 0xFFFFFFFF,
created->tm_year + 1900,
created->tm_mon + 1,
@@ -337,7 +501,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
display_fingerprint(keys);
}
if (verbose) {
- list_sigs(curuid->sigs, html);
+ list_sigs(dbctx, curuid->sigs, html);
}
curuid = curuid->next;
} else {
@@ -348,9 +512,9 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
}
}
- list_uids(keyid, curuid, verbose, html);
+ list_uids(dbctx, keyid, curuid, verbose, html);
if (verbose) {
- list_subkeys(keys->subkeys, verbose, html);
+ list_subkeys(dbctx, keys->subkeys, verbose, html);
}
keys = keys->next;
@@ -377,9 +541,9 @@ int mrkey_index(struct openpgp_publickey *keys)
int type = 0;
int length = 0;
int i = 0;
- size_t fplength = 0;
- unsigned char fp[20];
int c;
+ uint64_t keyid;
+ struct openpgp_fingerprint fingerprint;
while (keys != NULL) {
created_time = (keys->publickey->data[1] << 24) +
@@ -392,26 +556,27 @@ int mrkey_index(struct openpgp_publickey *keys)
switch (keys->publickey->data[0]) {
case 2:
case 3:
- printf("%016" PRIX64, get_keyid(keys));
+ if (get_keyid(keys, &keyid) != ONAK_E_OK) {
+ logthing(LOGTHING_ERROR, "Couldn't get keyid");
+ }
+ printf("%016" PRIX64, keyid);
type = keys->publickey->data[7];
- length = (keys->publickey->data[8] << 8) +
- keys->publickey->data[9];
break;
case 4:
- (void) get_fingerprint(keys->publickey, fp, &fplength);
+ case 5:
+ (void) get_fingerprint(keys->publickey, &fingerprint);
- for (i = 0; i < fplength; i++) {
- printf("%02X", fp[i]);
+ for (i = 0; i < fingerprint.length; i++) {
+ printf("%02X", fingerprint.fp[i]);
}
type = keys->publickey->data[5];
- length = (keys->publickey->data[6] << 8) +
- keys->publickey->data[7];
break;
default:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
+ logthing(LOGTHING_ERROR, "Unknown key version: %d",
keys->publickey->data[0]);
}
+ length = keylength(keys->publickey);
printf(":%d:%d:%ld::%s\n",
type,