Merge pull request #88 from CyberShadow/no-object-files

Properly make these bindings a "header-only" (.di) library

Author: Geod24

.github/workflows/ci.yml

@@ -140,7 +140,6 @@ jobs:
         # We don't checkout in $GITHUB_WORKSPACE to avoid polluting the repository with artifacts,
         # e.g. the C openssl library or Vibe.d
         cd ${{ github.workspace }}/deimos-openssl/
-        dub test
         cd examples/sslecho/
         ${{ github.workspace }}/openssl/install/bin/openssl req -batch -newkey rsa:4096 -x509 -sha256 -days 3650 -subj "/C=GB/CN=localhost" -nodes -out cert.pem -keyout key.pem
         dub build

.gitignore

@@ -1,5 +1,5 @@
 # Generated version file
-/source/deimos/openssl/version_.d
+/source/deimos/openssl/version_.di
 
 # DUB artifacts
 /.dub/

dub.sdl

@@ -21,12 +21,3 @@ configuration "library-manual-version" {
 configuration "library-applink" {
 	targetType "sourceLibrary"
 }
-
-configuration "unittest" {
-	targetType "executable"
-	targetName "openssl-test-library"
-	dflags "-main"
-	excludedSourceFiles "source/deimos/openssl/applink.d"
-	preGenerateCommands `${DUB} scripts/generate_version.d` platform="posix"
-	versions `DeimosOpenSSLAutoDetect`
-}

scripts/generate_version.d

@@ -13,7 +13,7 @@
  *
  * It is called directly as a `preGenerateCommand` (see dub.sdl).
  * To use it with another build system, pass the directory in which to write
- * the `version_.d` file as first and only argument. The directory
+ * the `version_.di` file as first and only argument. The directory
  * must exist, this script will not create it.
  */
 module generate_version;
@@ -42,14 +42,14 @@ void main(string[] args)
     {
         assert(args[1].isDir(),
                "OpenSSL version detection: Argument '" ~ args[1] ~ "' is not a directory");
-        target = args[1].buildPath("version_.d");
+        target = args[1].buildPath("version_.di");
     }
     else
     {
         assert(args.length == 1,
                "OpenSSL version detection expects only one argument, " ~
-               "a directory path where to write `version_.d`");
-        target = TARGET_DIR_PATH.buildPath("version_.d");
+               "a directory path where to write `version_.di`");
+        target = TARGET_DIR_PATH.buildPath("version_.di");
     }
 
     string opensslVersion;

source/deimos/openssl/_d_util.d renamed to source/deimos/openssl/_d_util.di

@@ -1,4 +1,3 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *

source/deimos/openssl/aes.d renamed to source/deimos/openssl/aes.di

@@ -564,7 +564,7 @@ enum ASN1_TFLG_NDEF = (0x1<<11);
 /* This is the actual ASN1 item itself */
 
 struct ASN1_ITEM_st {
-char itype;			/* The item type, primitive, SEQUENCE, CHOICE or extern */
+ubyte itype;			/* The item type, primitive, SEQUENCE, CHOICE or extern */
 c_long utype;			/* underlying type */
 const(ASN1_TEMPLATE)* templates;	/* If SEQUENCE or CHOICE this contains the contents */
 c_long tcount;			/* Number of templates if SEQUENCE or CHOICE */
@@ -639,7 +639,7 @@ enum ASN1_ITYPE_NDEF_SEQUENCE = 0x6;
  */
 
 struct ASN1_TLC_st{
-	char valid;	/* Values below are valid */
+	ubyte valid;	/* Values below are valid */
 	int ret;	/* return value */
 	c_long plen;	/* length */
 	int ptag;	/* class value */