Merge remote-tracking branch 'jose_upstream/master' into libfixes

Signed-off-by: Sergio Arroutbi Braojos <sarroutb@redhat.com>

.github/workflows/build.yml

@@ -6,19 +6,32 @@ on: [push, pull_request]
 jobs:
   linux:
     runs-on: ubuntu-18.04
+    continue-on-error: ${{ ! matrix.stable }}
     strategy:
       matrix:
         compiler:
           - gcc
           - clang
         os:
-          - fedora:rawhide
           - fedora:latest
           - centos:8
           - debian:testing
           - debian:latest
-          - ubuntu:devel
           - ubuntu:rolling
+        stable:: [true]
+        include:
+          - compiler: gcc
+            os: fedora:rawhide
+            stable: false
+          - compiler: clang
+            os: fedora:rawhide
+            stable: false
+          - compiler: gcc
+            os: ubuntu:devel
+            stable: false
+          - compiler: clang
+            os: ubuntu:devel
+            stable: false
     steps:
       - uses: actions/checkout@v2
 

.github/workflows/install-dependencies

@@ -15,8 +15,12 @@ debian:*|ubuntu:*)
     export DEBIAN_FRONTEND=noninteractive
     apt clean
     apt update
-    apt -y install build-essential pkg-config libssl-dev zlib1g-dev \
-                   libjansson-dev ${COMMON}
+    # We get some errors once in a while, so let's try a few times.
+    for i in 1 2 3; do
+        apt -y install build-essential pkg-config libssl-dev zlib1g-dev \
+                       libjansson-dev ${COMMON} && break
+        sleep 5
+    done
     ;;
 
 fedora:*)

cmd/jose.c

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <cmd/jose.h>
+#include "jose.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

cmd/meson.build

@@ -21,7 +21,7 @@ executable(meson.project_name(),
   'jwe/enc.c',
   'alg.c',
   'fmt.c',
-  dependencies: jansson,
-  link_with: libjose,
+
+  dependencies: libjose_dep,
   install: true
 )

doc/man/jose-jwe-enc.1.adoc

@@ -110,6 +110,7 @@ Compress plaintext before encryption:
     $ jose jwe enc -i '{"protected":{"zip":"DEF"}}' ...
 
 Encrypt with two keys and two passwords:
+
     $ jose jwk gen -i '{"alg":"ECDH-ES+A128KW"}' -o ec.jwk
     $ jose jwk gen -i '{"alg":"RSA1_5"}' -o rsa.jwk
     $ jose jwe enc -I msg.txt -p -k ec.jwk -p -k rsa.jwk -o msg.jwe

jose/meson.build → include/jose/meson.build

@@ -1,13 +1,14 @@
 cd = configuration_data()
 cd.set('VERSION', meson.project_version())
-configure_file(
+
+jose_h = configure_file(
   input: 'jose.h.in',
   output: 'jose.h',
   configuration: cd
 )
 
 install_headers(
-  meson.current_build_dir() + '/jose.h',
+  jose_h,
   'cfg.h',
   'io.h',
   'b64.h',

include/meson.build

@@ -0,0 +1,3 @@
+incdir = include_directories('.')
+
+subdir('jose')

lib/meson.build

@@ -6,7 +6,7 @@ if not cc.links(code, args: flags, name: '-Wl,--version-script=...')
   flags = [ '-export-symbols-regex=^jose_.*' ]
 endif
 
-libjose = library('jose',
+libjose_lib = library('jose',
   'misc.c',           'misc.h',
   'cfg.c',
   'io.c',
@@ -39,9 +39,15 @@ libjose = library('jose',
   'openssl/rsaes.c',
   'openssl/rsassa.c',
 
+  include_directories: incdir,
   dependencies: [zlib, jansson, libcrypto, threads],
   version: '0.0.0',
   link_args: flags,
   install: true
 )
 
+libjose_dep = declare_dependency(
+  include_directories: incdir,
+  dependencies: jansson,
+  link_with: libjose_lib
+)

meson.build

@@ -14,8 +14,6 @@ if host_machine.system() == 'freebsd'
 endif
 
 add_project_arguments(
-  '-I' + meson.current_source_dir(),
-  '-I' + meson.current_build_dir(),
   '-Wstrict-aliasing',
   '-Wchar-subscripts',
   '-Wformat-security',
@@ -38,7 +36,7 @@ add_project_arguments(
 zlib = dependency('zlib')
 threads = dependency('threads')
 jansson = dependency('jansson', version: '>=2.10')
-if host_machine.system() == 'freebsd'
+if build_machine.system() == 'freebsd'
   libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/lib/' ])
 else
   libcrypto = dependency('libcrypto', version: '>=1.0.2')
@@ -49,7 +47,7 @@ mans = []
 
 licenses = ['COPYING']
 
-subdir('jose')
+subdir('include')
 subdir('doc')
 subdir('lib')
 subdir('cmd')
@@ -58,14 +56,14 @@ subdir('tests')
 install_data(licenses, install_dir: licensedir)
 
 pkg = import('pkgconfig')
-if host_machine.system() == 'freebsd'
+if build_machine.system() == 'freebsd'
   pkg.generate(
     description: 'Library for managing JOSE objects',
     version: meson.project_version(),
     filebase: meson.project_name(),
     name: 'José Library',
     requires_private: 'zlib',
-    libraries: libjose,
+    libraries: libjose_lib,
     requires: 'jansson',
   )
 else
@@ -75,7 +73,7 @@ else
     filebase: meson.project_name(),
     name: 'José Library',
     requires_private: [ 'zlib', 'libcrypto' ],
-    libraries: libjose,
+    libraries: libjose_lib,
     requires: 'jansson',
   )
 endif

tests/issue-75/meson.build

@@ -3,7 +3,6 @@ e = environment()
 openssl = dependency('openssl', version: '>= 1.1.0',  required: false)
 if openssl.found()
   issue75 = executable('issue75', 'issue-75.c',
-                       dependencies: [jansson, openssl],
-                       link_with: libjose)
+                       dependencies: [libjose_dep, openssl])
   test('issue75', issue75, workdir : meson.current_source_dir(), env: e, timeout: 30)
 endif

tests/jose-fmt

@@ -1,7 +1,5 @@
 #!/bin/sh -ex
 
-export PATH=../cmd:$PATH
-
 jose fmt -j '{}' -O
 ! jose fmt -j '{}' -A
 ! jose fmt -j '{}' -S

tests/jose-jwk-use

@@ -1,7 +1,5 @@
 #!/bin/sh -ex
 
-export PATH=../cmd:$PATH
-
 echo '{}' | jose jwk use -i- -u encrypt
 ! echo '{}' | jose jwk use -i- -r -u encrypt
 

tests/meson.build

@@ -33,7 +33,7 @@ e.prepend('PATH', meson.current_build_dir() + '/../cmd', separator: ':')
 e.set('VECTORS', meson.current_source_dir() + '/vectors')
 
 foreach p: progs
-  exe = executable(p, p + '.c', dependencies: jansson, link_with: libjose)
+  exe = executable(p, p + '.c', dependencies: libjose_dep)
   if p == 'api_b64'
     to = 1800
   else