cscvs to tla changeset 113

[onak.git] / keyid.c

diff --git a/keyid.c b/keyid.c
index ced0c458997a79818518133067b645b8c851faec..8cf32ba0933533775c0219a0e21b30f45529976f 100644 (file)
--- a/keyid.c
+++ b/keyid.c
@@ -4,12 +4,15 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

+ *
+ * $Id: keyid.c,v 1.7 2003/06/04 20:57:09 noodles Exp $

  */
 
 #include <sys/types.h>
 
 #include "keyid.h"
 #include "keystructs.h"
  */
 
 #include <sys/types.h>
 
 #include "keyid.h"
 #include "keystructs.h"

+#include "log.h"

 #include "md5.h"
 #include "sha.h"
 
 #include "md5.h"
 #include "sha.h"
 


@@ -93,7 +96,7 @@ unsigned char *get_fingerprint(struct openpgp_packet *packet,
                memcpy(fingerprint, buff, *len);
                break;
        default:
                memcpy(fingerprint, buff, *len);
                break;
        default:

-               fprintf(stderr, "Unknown key type: %d\n",
+               logthing(LOGTHING_ERROR, "Unknown key type: %d",

                                packet->data[0]);
        }
 
                                packet->data[0]);
        }
 


@@ -135,7 +138,8 @@ uint64_t get_packetid(struct openpgp_packet *packet)
                                keyid += packet->data[offset++];
                        }
                } else {
                                keyid += packet->data[offset++];
                        }
                } else {

-                       fputs("Type 2 or 3 key, but not RSA.\n", stderr);
+                       logthing(LOGTHING_ERROR,
+                                       "Type 2 or 3 key, but not RSA.");

                }
                break;
        case 4:
                }
                break;
        case 4:


@@ -148,7 +152,7 @@ uint64_t get_packetid(struct openpgp_packet *packet)
 
                break;
        default:
 
                break;
        default:

-               fprintf(stderr, "Unknown key type: %d\n",
+               logthing(LOGTHING_ERROR, "Unknown key type: %d",

                                packet->data[0]);
        }
 
                                packet->data[0]);
        }