Modified build/builtin-certs-update from [5324a34988] to [9fea13231c].

     4      4   
     5      5   ourdir="$(dirname "$(which "$0")")"
     6      6   cd "${outdir}" || exit 1
     7      7   
     8      8   make -C certs/dod distclean all
     9      9   make -C certs/federal distclean all
    10     10   
    11         -./certs-to-c certs/*/*.crt > ../cackey_builtin_certs.h
           11  +if [ "$1" = '--commercial' ]; then
           12  +	commercial='commercial'
           13  +else
           14  +	commercial='SKIP'
           15  +fi
           16  +
           17  +./certs-to-c certs/{dod,federal,$commercial}/*.crt > ../cackey_builtin_certs.h

Modified build/certs-to-c from [1cd87f2aca] to [e4223940e0].

     1      1   #! /bin/bash
     2      2   
     3      3   for file in "$@"; do
            4  +	if [ ! -f "${file}" ]; then
            5  +		continue
            6  +	fi
            7  +
     4      8   	rm -f tmpfile.x509
     5      9   	if ! openssl x509 -in "${file}" -inform pem -noout -checkend 0 >/dev/null 2>/dev/null; then
     6     10   		echo "warning: Skipping \"${file}\" as it is invalid or expired." >&2
     7     11   
     8     12   		continue
     9     13   	fi
    10     14   
    11     15   	openssl x509 -in "${file}" -out tmpfile.x509 -inform pem -outform der
    12     16   
    13         -	pubkeylen="$(openssl x509 -in tmpfile.x509 -inform der -text -noout | grep 'RSA Public Key:' | sed 's@^.*(\([0-9][0-9]*\) bit).*$@\1@')"
    14         -	certlen="$(cat tmpfile.x509 | wc -c)"
           17  +	pubkeylen="$(openssl x509 -in tmpfile.x509 -inform der -text -noout | grep 'Public[- ]Key:' | sed 's@^.*(\([0-9][0-9]*\) bit).*$@\1@')"
           18  +	certlen="$(cat tmpfile.x509 | wc -c | awk '{ print $1 }')"
    15     19   	cert="$(( cat tmpfile.x509 | od -t x1 | cut -c 9- | tr "\n" ' '; echo ) | sed 's@ @@g;s@..@\\x&@g')"
    16     20   
    17     21   	cat << _EOF_
           22  +	/* ${file} */
    18     23   	{
    19     24   		CACKEY_ID_TYPE_CERT_ONLY, /* id_type */
    20     25   		${certlen}, /* certificate_len */
    21     26   		(unsigned char *) "${cert}", /* certificate */
    22     27   		${pubkeylen} /* keysize */
    23     28   	},
    24     29   _EOF_
    25     30   done
    26     31   
    27     32   rm -f tmpfile.x509

Modified cackey_builtin_certs.h from [12e127fbbb] to [cffe24d77b].

cannot compute difference between binary files