Changeset 314

Timestamp:

11/29/05 16:06:23

Author:

ben

Message:

Inline signing. Not 100% RFC compliant yet, but seems to work. References #26.

Files:

• openpgpsdk/trunk/examples (modified) (1 prop)
• openpgpsdk/trunk/examples/Makefile.template (modified) (3 diffs)
• openpgpsdk/trunk/examples/create-key.c (modified) (1 diff)
• openpgpsdk/trunk/examples/create-signed-key.c (modified) (2 diffs)
• openpgpsdk/trunk/examples/sign-detached.c (added)
• openpgpsdk/trunk/examples/sign-inline.c (added)
• openpgpsdk/trunk/include/openpgpsdk/armour.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/create.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/crypto.h (modified) (2 diffs)
• openpgpsdk/trunk/include/openpgpsdk/signature.h (modified) (3 diffs)
• openpgpsdk/trunk/src/armour.c (modified) (2 diffs)
• openpgpsdk/trunk/src/create.c (modified) (11 diffs)
• openpgpsdk/trunk/src/memory.c (modified) (2 diffs)
• openpgpsdk/trunk/src/openssl_crypto.c (modified) (3 diffs)
• openpgpsdk/trunk/src/signature.c (modified) (1 diff)
• openpgpsdk/trunk/test/91A285AE301B7D6B.pub (added)
• openpgpsdk/trunk/test/rsa-public-key-v4-A0CFDA99.raw (added)

openpgpsdk/trunk/examples/Makefile.template

@@ -7 +7 @@
-LIBDEPS=common.o ../src/libops.a
-LIBS=$(LIBDEPS) %CRYPTO_LIBS% %ZLIB% $(DM_LIB) %LIBS%
-
+
+
-
-all: Makefile .depend $(EXES)
@@ -33 +34 @@
-sign-detached: sign-detached.o $(LIBDEPS)
-        $(CC) $(LDFLAGS) -o sign-detached sign-detached.o $(LIBS)
+
+sign-inline: sign-inline.o $(LIBDEPS)
+        $(CC) $(LDFLAGS) -o sign-inline sign-inline.o $(LIBS)
-
-tags:
@@ -82 +86 @@
-        ./sign-detached $(SCRATCH)/key.sec "Why a user ID?" SHA1 $(SCRATCH)/to-be-signed-detached $(SCRATCH)/to-be-signed-detached.sig
-
+test-sign-inline: $(SCRATCH)/key.sec sign-inline
+        echo "Sign this!" > $(SCRATCH)/to-be-signed-inline
+        echo "- test dash-escaping" >> $(SCRATCH)/to-be-signed-inline
+        ./sign-inline $(SCRATCH)/key.sec "Why a user ID?" SHA1 $(SCRATCH)/to-be-signed-inline $(SCRATCH)/to-be-signed-inline.sig
+
-include .depend

openpgpsdk/trunk/examples/create-key.c

@@ -26 +26 @@
-
-    info=ops_create_info_new();
-create_info_set_writer
+writer_set
-
-    ops_write_rsa_public_key(time(NULL),n,e,info);

openpgpsdk/trunk/examples/create-signed-key.c

@@ -63 +63 @@
-        exit(2);
-        }
-create_info_set_writer
+writer_set
-
-    ops_write_struct_secret_key(&skey,info);
-
-create_info_close_writer
+writer_close
-
-    close(fd);
@@ -77 +77 @@
-        exit(2);
-        }
-create_info_set_writer
+writer_set
-
-    ops_write_struct_public_key(&skey.public_key,info);

openpgpsdk/trunk/include/openpgpsdk/armour.h

@@ -1 +1 @@
-#include "packet-parse.h"
+#include "signature.h"
-
-void ops_reader_push_dearmour(ops_parse_info_t *parse_info);
-void ops_reader_pop_dearmour(ops_parse_info_t *parse_info);
+void ops_writer_push_dash_escaped(ops_create_info_t *info,
+                                  ops_create_signature_t *sig);
+void ops_writer_switch_to_signature(ops_create_info_t *info);
+

openpgpsdk/trunk/include/openpgpsdk/create.h

@@ -11 +11 @@
-#include "errors.h"
-
-
-
-
-
-
-
-
-
-
+
-/**
- * \ingroup Create
- * the writer function prototype
- */
-writer_ret
+boolean
-                                      unsigned length,
-                                      ops_writer_flags_t flags,
-                                      ops_error_t **errors,
-
-
-
-
-
-
-
-
+
+
+
+
-
-ops_create_info_t *ops_create_info_new(void);
-void ops_create_info_delete(ops_create_info_t *info);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-ops_boolean_t ops_write(const void *src,unsigned length,

openpgpsdk/trunk/include/openpgpsdk/crypto.h

@@ -19 +19 @@
-    {
-    ops_hash_algorithm_t algorithm;
+    const char *name;
-    ops_hash_init_t *init;
-    ops_hash_add_t *add;
@@ -31 +32 @@
-void ops_hash_any(ops_hash_t *hash,ops_hash_algorithm_t alg);
-ops_hash_algorithm_t ops_hash_algorithm_from_text(const char *hash);
+const char *ops_text_from_hash(ops_hash_t *hash);
-unsigned ops_hash_size(ops_hash_algorithm_t alg);
-

openpgpsdk/trunk/include/openpgpsdk/signature.h

@@ -1 +1 @@
-/** \file
- */
+
+#ifndef OPS_SIGNATURE_H
+#define OPS_SIGNATURE_H
-
-#include "packet.h"
@@ -37 +40 @@
-void ops_signature_add_data(ops_create_signature_t *sig,const void *buf,
-                            size_t length);
+ops_hash_t *ops_signature_get_hash(ops_create_signature_t *sig);
-void ops_signature_hashed_subpackets_end(ops_create_signature_t *sig);
-void ops_write_signature(ops_create_signature_t *sig,ops_public_key_t *key,
@@ -45 +49 @@
-void ops_signature_add_primary_user_id(ops_create_signature_t *sig,
-                                       ops_boolean_t primary);
+
+#endif

openpgpsdk/trunk/src/armour.c

@@ -3 +3 @@
-#include <openpgpsdk/util.h>
-#include <openpgpsdk/crypto.h>
+#include <openpgpsdk/create.h>
+#include <openpgpsdk/signature.h>
-
-#include <string.h>
@@ -707 +709 @@
-    free(arg);
-    }
+
+typedef struct
+    {
+    ops_boolean_t seen_nl:1;
+    ops_boolean_t seen_cr:1;
+    ops_create_signature_t *sig;
+    } dash_escaped_arg_t;
+
+static ops_boolean_t dash_escaped_writer(const unsigned char *src,
+                                         unsigned length,
+                                         ops_error_t **errors,
+                                         ops_writer_info_t *winfo)
+    {
+    dash_escaped_arg_t *arg=ops_writer_get_arg(winfo);
+    unsigned n;
+
+    // XXX: make this efficient
+    for(n=0 ; n < length ; ++n)
+        {
+        if(arg->seen_nl)
+            {
+            if(src[n] == '-' && !ops_stacked_write("- ",2,errors,winfo))
+                return ops_false;
+            arg->seen_nl=ops_false;
+            }
+        arg->seen_nl=src[n] == '\n';
+        if(arg->seen_nl && !arg->seen_cr)
+            {
+            if(!ops_stacked_write("\r",1,errors,winfo))
+                return ops_false;
+            ops_signature_add_data(arg->sig,"\r",1);
+            }
+        arg->seen_cr=src[n] == '\r';
+        if(!ops_stacked_write(&src[n],1,errors,winfo))
+            return ops_false;
+        ops_signature_add_data(arg->sig,&src[n],1);
+        }
+
+    return ops_true;
+    }
+
+void dash_escaped_destroyer(ops_writer_info_t *winfo)
+    {
+    dash_escaped_arg_t *arg=ops_writer_get_arg(winfo);
+
+    free(arg);
+    }
+
+// XXX: should return errors.
+void ops_writer_push_dash_escaped(ops_create_info_t *info,
+                                  ops_create_signature_t *sig)
+    {
+    static char header[]="-----BEGIN PGP SIGNED MESSAGE-----\r\nHash: ";
+    const char *hash=ops_text_from_hash(ops_signature_get_hash(sig));
+    dash_escaped_arg_t *arg=ops_mallocz(sizeof *arg);
+
+    ops_write(header,sizeof header-1,info);
+    ops_write(hash,strlen(hash),info);
+    ops_write("\r\n\r\n",4,info);
+    arg->seen_nl=ops_true;
+    arg->sig=sig;
+    ops_writer_push(info,dash_escaped_writer,NULL,dash_escaped_destroyer,arg);
+    }
+
+typedef struct
+    {
+    unsigned pos;
+    unsigned char t;
+    } base64_arg_t;
+
+static char b64map[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+"0123456789+/";
+
+static ops_boolean_t base64_writer(const unsigned char *src,
+                                      unsigned length,
+                                      ops_error_t **errors,
+                                      ops_writer_info_t *winfo)
+    {
+    base64_arg_t *arg=ops_writer_get_arg(winfo);
+    unsigned n;
+
+    for(n=0 ; n < length ; )
+        {
+        if(arg->pos == 0)
+            {
+            /* XXXXXX00 00000000 00000000 */
+            if(!ops_stacked_write(&b64map[src[n] >> 2],1,errors,winfo))
+                return ops_false;
+
+            /* 000000XX xxxx0000 00000000 */
+            arg->t=(src[n++]&3) << 4;
+            arg->pos=1;
+            }
+        else if(arg->pos == 1)
+            {
+            /* 000000xx XXXX0000 00000000 */
+            arg->t+=src[n] >> 4;
+            if(!ops_stacked_write(&b64map[arg->t],1,errors,winfo))
+                return ops_false;
+
+            /* 00000000 0000XXXX xx000000 */
+            arg->t=(src[n++]&0xf) << 2;
+            arg->pos=2;
+            }
+        else if(arg->pos == 2)
+            {
+            /* 00000000 0000xxxx XX000000 */
+            arg->t+=src[n] >> 6;
+            if(!ops_stacked_write(&b64map[arg->t],1,errors,winfo))
+                return ops_false;
+
+            /* 00000000 00000000 00XXXXXX */
+            if(!ops_stacked_write(&b64map[src[n++]&0x3f],1,errors,winfo))
+                return ops_false;
+
+            arg->pos=0;
+            }
+        }
+
+    return ops_true;
+    }
+
+static ops_boolean_t signature_finaliser(ops_error_t **errors,
+                                         ops_writer_info_t *winfo)
+    {
+    base64_arg_t *arg=ops_writer_get_arg(winfo);
+    static char trailer[]="\r\n-----END PGP SIGNATURE-----\r\n";
+
+    if(arg->pos)
+        {
+        if(!ops_stacked_write(&b64map[arg->t],1,errors,winfo))
+            return ops_false;
+        if(arg->pos == 1 && !ops_stacked_write("==",2,errors,winfo))
+            return ops_false;
+        if(arg->pos == 2 && !ops_stacked_write("=",1,errors,winfo))
+            return ops_false;
+        }
+    if(!ops_stacked_write(trailer,sizeof trailer-1,errors,winfo))
+        return ops_false;
+
+    return ops_true;
+    }
+
+typedef struct
+    {
+    unsigned pos;
+    } linebreak_arg_t;
+
+#define BREAKPOS        76
+
+static ops_boolean_t linebreak_writer(const unsigned char *src,
+                                         unsigned length,
+                                         ops_error_t **errors,
+                                         ops_writer_info_t *winfo)
+    {
+    linebreak_arg_t *arg=ops_writer_get_arg(winfo);
+    unsigned n;
+
+    for(n=0 ; n < length ; ++n,++arg->pos)
+        {
+        if(src[n] == '\r' || src[n] == '\n')
+            arg->pos=0;
+
+        if(arg->pos == BREAKPOS)
+            {
+            if(!ops_stacked_write("\r\n",2,errors,winfo))
+                return ops_false;
+            arg->pos=0;
+            }
+        if(!ops_stacked_write(&src[n],1,errors,winfo))
+            return ops_false;
+        }
+
+    return ops_true;
+    }
+
+// XXX: should return errors.
+void ops_writer_switch_to_signature(ops_create_info_t *info)
+    {
+    static char header[]="\r\n-----BEGIN PGP SIGNATURE-----\r\n\r\n";
+
+    ops_writer_pop(info);
+    ops_write(header,sizeof header-1,info);
+    ops_writer_push(info,linebreak_writer,NULL,ops_writer_generic_destroyer,
+                    ops_mallocz(sizeof(linebreak_arg_t)));
+    ops_writer_push(info,base64_writer,signature_finaliser,
+                    ops_writer_generic_destroyer,
+                    ops_mallocz(sizeof(base64_arg_t)));
+    }

openpgpsdk/trunk/src/create.c

@@ -8 +8 @@
-#include <unistd.h>
-
+struct ops_writer_info
+    {
+    ops_writer_t *writer;
+    ops_writer_finaliser_t *finaliser;
+    ops_writer_destroyer_t *destroyer;
+    void *arg;
+    ops_writer_info_t *next;
+    };
+
-/**
- * \ingroup Create
@@ -14 +23 @@
-struct ops_create_info
-    {
-
-
-
+
-    ops_error_t *errors;        /*!< an error stack */
-    };
@@ -26 +33 @@
-                                ops_create_info_t *info)
-    {
-riter(src,length,0,&info->errors,info->arg) == OPS_W_OK
+info.writer(src,length,&info->errors,&info->winfo)
-    }
-
@@ -493 +500 @@
-    { return ops_mallocz(sizeof(ops_create_info_t)); }
-
+static ops_boolean_t writer_info_finalise(ops_error_t **errors,
+                                          ops_writer_info_t *winfo)
+    {
+    ops_boolean_t ret=ops_true;
+
+    if(winfo->next && !writer_info_finalise(errors,winfo->next))
+        {
+        winfo->finaliser=NULL;
+        return ops_false;
+        }
+    if(winfo->finaliser)
+        {
+        ret=winfo->finaliser(errors,winfo);
+        winfo->finaliser=NULL;
+        }
+    return ret;
+    }
+
+static void writer_info_delete(ops_writer_info_t *winfo)
+    {
+    // we should have finalised before deleting
+    assert(!winfo->finaliser);
+    if(winfo->next)
+        {
+        writer_info_delete(winfo->next);
+        free(winfo->next);
+        winfo->next=NULL;
+        }
+    if(winfo->destroyer)
+        {
+        winfo->destroyer(winfo);
+        winfo->destroyer=NULL;
+        }
+    winfo->writer=NULL;
+    }
+
-/**
- * \ingroup Create
@@ -503 +546 @@
-void ops_create_info_delete(ops_create_info_t *info)
-    {
-
-
-
-
-
-
+
-    free(info);
-    }
@@ -517 +555 @@
-    } writer_fd_arg_t;
-
-writer_ret
-         ops_writer_flags_t flag
-         ops_error_t **errors,void *arg_
-
-arg_
+boolean
+       ops_error_t **error
+       ops_writer_info_t *winfo
+
+ops_writer_get_arg(winfo)
-    int n=write(arg->fd,src,length);
-
-    OPS_USED(flags);
-
-    if(n == -1)
@@ -530 +566 @@
-        ops_system_error_1(errors,OPS_E_W_WRITE_FAILED,"write",
-                           "file descriptor %d",arg->fd);
-OPS_W_ERROR
+ops_false
-        }
-
@@ -537 +573 @@
-        ops_error_1(errors,OPS_E_W_WRITE_TOO_SHORT,
-                    "file descriptor %d",arg->fd);
-OPS_W_ERROR
-
-
-OPS_W_OK
-
-
-void *arg
-
-arg
+ops_false
+
+
+ops_true
+
+
+ops_writer_info_t *winfo
+
+ops_writer_get_arg(winfo)
-    }
-
@@ -560 +596 @@
- */
-
-create_info_set_writer
+writer_set
-    {
-    writer_fd_arg_t *arg=malloc(sizeof *arg);
-
-    arg->fd=fd;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- *
- * \param info The info structure
@@ -579 +614 @@
- * \param arg The argument for the writer and destroyer
- */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -597 +679 @@
- * \param info The info structure
- */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

openpgpsdk/trunk/src/memory.c

@@ -58 +58 @@
-    }
-
-
-
+
-                                      ops_error_t **errors,
-void *arg
+ops_writer_info_t *winfo
-    {
-arg
+ops_writer_get_arg(winfo)
-
-    OPS_USED(flags);
-    OPS_USED(errors);
-    ops_memory_add(mem,src,length);
-OPS_W_OK
+ops_true
-    }
-
@@ -84 +82 @@
-                                       ops_memory_t *mem)
-    {
-create_info_set_writer(info,memory_writer
+writer_set(info,memory_writer,NULL
-    }
-

openpgpsdk/trunk/src/openssl_crypto.c

@@ -32 +32 @@
-    }
-
-
+"MD5",
-
-void ops_hash_md5(ops_hash_t *hash)
@@ -60 +60 @@
-    }
-
-
+
+
-
-void ops_hash_sha1(ops_hash_t *hash)
@@ -159 +160 @@
-#endif
-    }
+
+const char *ops_text_from_hash(ops_hash_t *hash)
+    { return hash->name; }

openpgpsdk/trunk/src/signature.c

@@ -529 +529 @@
-    ops_write_scalar(primary,1,sig->info);
-    }
+
+/**
+ * \ingroup Create
+ *
+ * Get the hash structure in use for the signature.
+ *
+ * \param sig The signature structure.
+ * \return The hash structure.
+ */
+ops_hash_t *ops_signature_get_hash(ops_create_signature_t *sig)
+    { return &sig->hash; }
+