* 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 "log.h"
+#include "onak.h"
#include "parsekey.h"
#include "mem.h"
#include "merge.h"
#ifdef HAVE_NETTLE
#include <nettle/md5.h>
+#include <nettle/ripemd160.h>
#include <nettle/sha.h>
#else
#include "md5.h"
#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.
* @publickey: The key to calculate the id for.
*/
-uint64_t get_keyid(struct openpgp_publickey *publickey)
+onak_status_t get_keyid(struct openpgp_publickey *publickey, uint64_t *keyid)
{
- return (get_packetid(publickey->publickey));
+ return (get_packetid(publickey->publickey, keyid));
}
/**
* get_fingerprint - Given a public key returns the fingerprint.
* @publickey: The key to calculate the id for.
- * @fingerprint: The fingerprint (must be at least 20 bytes of space).
+ * @fingerprint: The fingerprint (must be at least 20 bytes of space).
* @len: The length of the returned fingerprint.
*
* This function returns the fingerprint for a given public key. As Type 3
* fingerprints are 16 bytes and Type 4 are 20 the len field indicates
* which we've returned.
*/
-unsigned char *get_fingerprint(struct openpgp_packet *packet,
- unsigned char *fingerprint,
- size_t *len)
+onak_status_t get_fingerprint(struct openpgp_packet *packet,
+ 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;
size_t modlen, explen;
- log_assert(fingerprint != NULL);
- log_assert(len != NULL);
+ if (fingerprint == NULL)
+ return ONAK_E_INVALID_PARAM;
- *len = 0;
+ fingerprint->length = 0;
switch (packet->data[0]) {
case 2:
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);
/*
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:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
- packet->data[0]);
+ return ONAK_E_UNKNOWN_VER;
}
- return fingerprint;
+ return ONAK_E_OK;
}
* get_packetid - Given a PGP packet returns the keyid.
* @packet: The packet to calculate the id for.
*/
-uint64_t get_packetid(struct openpgp_packet *packet)
+onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
{
- uint64_t keyid = 0;
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
- log_assert(packet != NULL);
+ if (packet == NULL || packet->data == NULL)
+ return ONAK_E_INVALID_PARAM;
switch (packet->data[0]) {
case 2:
case 3:
/*
- * For a type 2 or 3 key the keyid is the last 64 bits of the
- * public modulus n, which is stored as an MPI from offset 8
- * onwards.
+ * Old versions of GnuPG would put Elgamal keys inside
+ * a V3 key structure, then generate the keyid using
+ * RIPED160.
*/
- offset = (packet->data[8] << 8) +
- packet->data[9];
- offset = ((offset + 7) / 8) + 2;
-
- for (keyid = 0, i = 0; i < 8; i++) {
- keyid <<= 8;
- keyid += packet->data[offset++];
+#ifdef NETTLE_WITH_RIPEMD160
+ if (packet->data[7] == 16) {
+ ripemd160_init(&ripemd160_context);
+ data = 0x99;
+ ripemd160_update(&ripemd160_context, 1, &data);
+ data = packet->length >> 8;
+ ripemd160_update(&ripemd160_context, 1, &data);
+ data = packet->length & 0xFF;
+ ripemd160_update(&ripemd160_context, 1, &data);
+ ripemd160_update(&ripemd160_context,
+ packet->length,
+ packet->data);
+
+ ripemd160_digest(&ripemd160_context,
+ RIPEMD160_DIGEST_SIZE,
+ fingerprint.fp);
+ fingerprint.length = RIPEMD160_DIGEST_SIZE;
+
+ *keyid = fingerprint2keyid(&fingerprint);
+
+ return ONAK_E_OK;
}
+#endif
/*
- * Check for an RSA key; if not then log but accept anyway.
+ * Check for an RSA key; if not return an error.
* 1 == RSA
* 2 == RSA Encrypt-Only
* 3 == RSA Sign-Only
*/
if (packet->data[7] < 1 || packet->data[7] > 3) {
- logthing(LOGTHING_NOTICE,
- "Type 2 or 3 key, but not RSA: %llx (type %d)",
- keyid,
- packet->data[7]);
+ return ONAK_E_INVALID_PKT;
+ }
+
+ /*
+ * For a type 2 or 3 key the keyid is the last 64 bits of the
+ * public modulus n, which is stored as an MPI from offset 8
+ * onwards.
+ */
+ offset = (packet->data[8] << 8) +
+ packet->data[9];
+ offset = ((offset + 7) / 8) + 2;
+
+ for (*keyid = 0, i = 0; i < 8; i++) {
+ *keyid <<= 8;
+ *keyid += packet->data[offset++];
}
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:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
- packet->data[0]);
+ return ONAK_E_UNKNOWN_VER;
}
- return keyid;
+ return ONAK_E_OK;
}
static struct openpgp_packet_list *sortpackets(struct openpgp_packet_list
return sorted;
}
-void get_skshash(struct openpgp_publickey *key, struct skshash *hash)
+onak_status_t get_skshash(struct openpgp_publickey *key, struct skshash *hash)
{
struct openpgp_packet_list *packets = NULL, *list_end = NULL;
struct openpgp_packet_list *curpacket;
md5_digest(&md5_context, 16, (uint8_t *) &hash->hash);
free_packet_list(packets);
+
+ return ONAK_E_OK;
}
uint8_t hexdigit(char c)
projects / onak.git / blobdiff