Changeset 192

Timestamp:

06/29/05 15:36:11

Author:

ben

Message:

64-bit port, find socket libraries.

Files:

• openpgpsdk/trunk/configure (modified) (9 diffs)
• openpgpsdk/trunk/examples/Makefile.template (modified) (1 diff)
• openpgpsdk/trunk/include/packet.h (modified) (1 diff)
• openpgpsdk/trunk/src/Makefile.template (modified) (1 diff)
• openpgpsdk/trunk/src/packet-parse.c (modified) (5 diffs)

openpgpsdk/trunk/configure

@@ -9 +9 @@
-use IO::File;
-
+$|=1;
+
-our $Log;
-our $LogFile='/dev/null';
@@ -20 +22 @@
-
-our %Subst=(
-
-
+
+
+
+
-           );
-
@@ -38 +42 @@
-              my $loc=shift;
-              $Subst{INCLUDES}.=" -I $loc";
+              $Subst{ZLIB}="$loc/libz.a";
-          },
-          '--log=' => sub {
@@ -43 +48 @@
-              $Log=new IO::File(">$LogFile");
-              $Log->autoflush(1);
+          },
+          '--64' => sub {
+              $Subst{CFLAGS}.=' -m64';
-          }
-         );
+
+my %Functions=(
+               'socket' => { headers => ['sys/socket.h'],
+                             call => 'socket(0,0,0)',
+                             libs => [[],['socket','nsl']] },
+               );
-
-my @Headers=qw(alloca.h);
@@ -76 +90 @@
-findHeaders(\@Headers);
-investigateTypes(\@Types);
+my $libs=findLibraries(\%Functions);
+$Subst{'LIBS'}=join(' ',map { "-l$_" } @$libs);
+#exit;
-
-fixSubst();
@@ -186 +203 @@
-sub build {
-    my $code=shift;
+    my $link=shift;
-
-    my $cc=getKnowledge('cc');
@@ -198 +216 @@
-    $fh->close();
-
-
-
+
+
+
+
+
-    my $ret=system("$cmd >> $LogFile 2>&1");
-
@@ -205 +226 @@
-    $obj =~ s/\.c$/.o/;
-    unlink($obj) || $! == ENOENT || croak "unlink($obj): $!";
+    unlink('a.out') || $! == ENOENT || croak "unlink(a.out): $!";
-
-    chdir($cur) || croak "chdir($cur): $!";
@@ -246 +268 @@
-
-    foreach my $h (@$headers) {
+        print "Check required header $h\n";
-        build("#include <$h>\n") || croak "Can't find required header $h";
-    }
-}
+
+sub findLibraries {
+    my $funcs=shift;
+
+    my @libs;
+  func:
+    foreach my $func (keys %$funcs) {
+        print "Checking libraries for $func()\n";
+        my $code=join("\n",map { "#include <$_>" }
+                      @{$funcs->{$func}->{headers}});
+        $code.="\nint main() { $funcs->{$func}->{call}; return 0; }\n";
+        foreach my $lgroup (@{$funcs->{$func}->{libs}}) {
+            print "  trying ",@$lgroup ? join(', ',@$lgroup) : 'no libraries';
+            if(build($code,join(' ',map { "-l$_" } @$lgroup))) {
+                push @libs,@$lgroup;
+                print " ... OK\n";
+                next func;
+            }
+            print " ... no\n";
+        }
+    }
+    return \@libs;
+}
+

openpgpsdk/trunk/examples/Makefile.template

@@ -3 +3 @@
-CC=%CC%
-
-
-
+ %CFLAGS%
+ %CFLAGS%
-LIBDEPS=../src/libops.a
--lz $(DM_LIB)
+%ZLIB% $(DM_LIB) %LIBS%
-
-all: Makefile lib .depend packet-dump verify create-key create-signed-key

openpgpsdk/trunk/include/packet.h

@@ -639 +639 @@
-typedef struct
-    {
-size_t
+unsigned
-    unsigned char               data[8192];
-    } ops_literal_data_body_t;

openpgpsdk/trunk/src/Makefile.template

@@ -3 +3 @@
-CC=%CC%
-
-
+ %CFLAGS%
-LDFLAGS=-g
-LIBS=libops.a -lcrypto -lz $(DM_LIB)

openpgpsdk/trunk/src/packet-parse.c

@@ -242 +242 @@
-/** Read a scalar.
- *
-Big E
+big-e
- * boundaries (by calling limited_read() to read the raw data).
- *
@@ -248 +248 @@
- *
- * \param *dest         The scalar value is stored here
-
+ (at most 4)
- * \param *region       Pointer to current packet region
- * \param *opt          Pointer to parse options to be used
@@ -264 +264 @@
-    int n;
-
+    assert(length <= 4);
+    assert(sizeof(*dest) >= 4);
-    if(!ops_limited_read(c,length,region,opt))
-        return 0;
@@ -271 +273 @@
-    *dest=t;
-
+    return 1;
+    }
+
+/** Read a scalar.
+ *
+ * Read a big-endian scalar of length bytes, respecting packet
+ * boundaries (by calling limited_read() to read the raw data).
+ *
+ * The value read is stored in a size_t, which is a different size
+ * from an unsigned on some platforms.
+ *
+ * This function makes sure to respect packet boundaries.
+ *
+ * \param *dest         The scalar value is stored here
+ * \param length        How many bytes make up this scalar (at most 4)
+ * \param *region       Pointer to current packet region
+ * \param *opt          Pointer to parse options to be used
+ * \param *cb           The callback
+ * \return              1 on success, 0 on error (calls the cb with OPS_PARSER_ERROR in limited_read()).
+ *
+ * \see RFC2440bis-12 3.1
+ */
+static int limited_read_size_t_scalar(size_t *dest,unsigned length,
+                                      ops_region_t *region,
+                                      ops_parse_options_t *opt)
+    {
+    unsigned tmp;
+
+    assert(sizeof(*dest) >= 4);
+
+    /* Note that because the scalar is at most 4 bytes, we don't care
+       if size_t is bigger than usigned */
+    if(!limited_read_scalar(&tmp,length,region,opt))
+        return 0;
+
+    *dest=tmp;
-    return 1;
-    }
@@ -1000 +1038 @@
-        /* 2 octets of name length */
-
-
- 
+ize_t_s
+       
-            return 0;
-
-        /* 2 octets of value length */
-
-
- 
+ize_t_s
+       
-            return 0;
-