X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keyid.c;h=9ac97b15e1f75c0ba8886e18035afc2c1b79e08d;hb=a799cc2909f47d918d1ec7171a9edba28a9f5136;hp=6a9b5580c34fa1c6a9df2100f565fd117ce382dc;hpb=5cb3cfdb9d8caa6d7a4a1979c50c46896957b934;p=onak.git
diff --git a/keyid.c b/keyid.c
index 6a9b558..9ac97b1 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 .
*/
#include
#include
#include
-#include "config.h"
+#include "build-config.h"
#include "keyid.h"
#include "keystructs.h"
#include "onak.h"
@@ -38,6 +37,19 @@
#include "sha1.h"
#endif
+uint64_t fingerprint2keyid(struct openpgp_fingerprint *fingerprint)
+{
+ uint64_t keyid;
+ int i;
+
+ for (keyid = 0, i = 12; i < 20; i++) {
+ keyid <<= 8;
+ keyid += fingerprint->fp[i];
+ }
+
+ return keyid;
+}
+
/**
* get_keyid - Given a public key returns the keyid.
@@ -132,7 +144,7 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
uint8_t data;
#endif
- if (packet == NULL)
+ if (packet == NULL || packet->data == NULL)
return ONAK_E_INVALID_PARAM;
switch (packet->data[0]) {
@@ -159,11 +171,9 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
ripemd160_digest(&ripemd160_context,
RIPEMD160_DIGEST_SIZE,
fingerprint.fp);
+ fingerprint.length = RIPEMD160_DIGEST_SIZE;
- for (*keyid = 0, i = 12; i < 20; i++) {
- *keyid <<= 8;
- *keyid += fingerprint.fp[i];
- }
+ *keyid = fingerprint2keyid(&fingerprint);
return ONAK_E_OK;
}
@@ -194,11 +204,8 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
break;
case 4:
get_fingerprint(packet, &fingerprint);
-
- for (*keyid = 0, i = 12; i < 20; i++) {
- *keyid <<= 8;
- *keyid += fingerprint.fp[i];
- }
+
+ *keyid = fingerprint2keyid(&fingerprint);
break;
default: