X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keyid.c;h=6c789fdfd74c0344396d33e71af0a56e0760e3ff;hb=3da81770b841f841c5145f91a9ccedc296e13f4b;hp=6920ee478ef4bca7362bca7313047a199b01f02e;hpb=0f0f62d3505e60cac5fd35ebcdea525d9d79a3e1;p=onak.git

diff --git a/keyid.c b/keyid.c
index 6920ee4..6c789fd 100644
--- a/keyid.c
+++ b/keyid.c
@@ -13,15 +13,14 @@
  * 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 <string.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 
-#include "config.h"
+#include "build-config.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "onak.h"
@@ -38,6 +37,33 @@
 #include "sha1.h"
 #endif
 
+uint64_t fingerprint2keyid(struct openpgp_fingerprint *fingerprint)
+{
+	uint64_t keyid;
+	int i;
+
+	switch (fingerprint->length) {
+	case 20:
+		/* v4, keyid is last 64 bits */
+		for (keyid = 0, i = 12; i < 20; i++) {
+			keyid <<= 8;
+			keyid += fingerprint->fp[i];
+		}
+		break;
+	case 32:
+		/* v5, keyid is first 64 bits */
+		for (keyid = 0, i = 0; i < 8; i++) {
+			keyid <<= 8;
+			keyid += fingerprint->fp[i];
+		}
+		break;
+	default:
+		keyid = (uint64_t) -1;
+	}
+
+	return keyid;
+}
+
 
 /**
  *	get_keyid - Given a public key returns the keyid.
@@ -59,9 +85,11 @@ onak_status_t get_keyid(struct openpgp_publickey *publickey, uint64_t *keyid)
  *	which we've returned.
  */
 onak_status_t get_fingerprint(struct openpgp_packet *packet,
-	unsigned char *fingerprint,
-	size_t *len)
+	struct openpgp_fingerprint *fingerprint)
 {
+#ifdef HAVE_NETTLE
+	struct sha256_ctx sha2_ctx;
+#endif
 	struct sha1_ctx sha_ctx;
 	struct md5_ctx md5_context;
 	unsigned char c;
@@ -69,10 +97,8 @@ onak_status_t get_fingerprint(struct openpgp_packet *packet,
 
 	if (fingerprint == NULL)
 		return ONAK_E_INVALID_PARAM;
-	if (len == NULL)
-		return ONAK_E_INVALID_PARAM;
 
-	*len = 0;
+	fingerprint->length = 0;
 
 	switch (packet->data[0]) {
 	case 2:
@@ -90,11 +116,10 @@ onak_status_t get_fingerprint(struct openpgp_packet *packet,
 			 packet->data[11+modlen] + 7) >> 3;
 		md5_update(&md5_context, explen, &packet->data[12 + modlen]);
 
-		*len = 16;
-		md5_digest(&md5_context, *len, fingerprint);
+		fingerprint->length = 16;
+		md5_digest(&md5_context, fingerprint->length, fingerprint->fp);
 
 		break;
-
 	case 4:
 		sha1_init(&sha_ctx);
 		/*
@@ -109,10 +134,31 @@ onak_status_t get_fingerprint(struct openpgp_packet *packet,
 		sha1_update(&sha_ctx, sizeof(c), &c);
 		sha1_update(&sha_ctx, packet->length,
 			packet->data);
-		*len = 20;
-		sha1_digest(&sha_ctx, *len, fingerprint);
+		fingerprint->length = 20;
+		sha1_digest(&sha_ctx, fingerprint->length, fingerprint->fp);
+
+		break;
+#ifdef HAVE_NETTLE
+	case 5:
+		sha256_init(&sha2_ctx);
+		/* RFC4880bis 12.2 */
+		c = 0x9A;
+		sha256_update(&sha2_ctx, sizeof(c), &c);
+		c = packet->length >> 24;
+		sha256_update(&sha2_ctx, sizeof(c), &c);
+		c = packet->length >> 16;
+		sha256_update(&sha2_ctx, sizeof(c), &c);
+		c = packet->length >> 8;
+		sha256_update(&sha2_ctx, sizeof(c), &c);
+		c = packet->length & 0xFF;
+		sha256_update(&sha2_ctx, sizeof(c), &c);
+		sha256_update(&sha2_ctx, packet->length,
+			packet->data);
+		fingerprint->length = 32;
+		sha256_digest(&sha2_ctx, fingerprint->length, fingerprint->fp);
 
 		break;
+#endif
 	default:
 		return ONAK_E_UNKNOWN_VER;
 	}
@@ -129,14 +175,13 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
 {
 	int		offset = 0;
 	int		i = 0;
-	size_t		length = 0;
-	unsigned char	buff[20];
+	struct openpgp_fingerprint fingerprint;
 #ifdef NETTLE_WITH_RIPEMD160
 	struct ripemd160_ctx ripemd160_context;
 	uint8_t		data;
 #endif
 
-	if (packet == NULL)
+	if (packet == NULL || packet->data == NULL)
 		return ONAK_E_INVALID_PARAM;
 
 	switch (packet->data[0]) {
@@ -162,12 +207,10 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
 
 			ripemd160_digest(&ripemd160_context,
 				RIPEMD160_DIGEST_SIZE,
-				buff);
+				fingerprint.fp);
+			fingerprint.length = RIPEMD160_DIGEST_SIZE;
 
-			for (*keyid = 0, i = 12; i < 20; i++) {
-				*keyid <<= 8;
-				*keyid += buff[i];
-			}
+			*keyid = fingerprint2keyid(&fingerprint);
 
 			return ONAK_E_OK;
 		}
@@ -197,13 +240,9 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
 		}
 		break;
 	case 4:
-		get_fingerprint(packet, buff, &length);
-		
-		for (*keyid = 0, i = 12; i < 20; i++) {
-			*keyid <<= 8;
-			*keyid += buff[i];
-		}
-
+	case 5:
+		get_fingerprint(packet, &fingerprint);
+		*keyid = fingerprint2keyid(&fingerprint);
 		break;
 	default:
 		return ONAK_E_UNKNOWN_VER;